Wykres commitów

2474 Commity (c298d5d301584f4a664776453bab688397403d4f)

Autor SHA1 Wiadomość Data
Matt Westcott c298d5d301 changelog entry for #465 2014-10-01 16:33:14 +01:00
Matt Westcott b295ba47f6 Merge branch 'es-fix' of https://github.com/kaedroho/wagtail into kaedroho-es-fix
Conflicts:
	wagtail/wagtailsearch/backends/elasticsearch.py
2014-10-01 16:27:26 +01:00
Matt Westcott 8e8dc5340b failing test for #465 2014-10-01 16:22:25 +01:00
Matt Westcott 751c1136d6 add upgrade considerations note re reduction of title boost 2014-10-01 15:37:31 +01:00
Matt Westcott 0560f01ac1 Merge branch 'kaedroho-searchchanges/title-boost-fix' 2014-10-01 15:07:35 +01:00
Matt Westcott 3f61e8a650 release note for 554 2014-10-01 15:04:12 +01:00
Matt Westcott a72943025f Merge branch 'searchchanges/title-boost-fix' of https://github.com/kaedroho/wagtail into kaedroho-searchchanges/title-boost-fix
Conflicts:
	wagtail/wagtailcore/models.py
2014-10-01 15:00:05 +01:00
Matt Westcott d53c56cf27 Document the register_permissions hook 2014-10-01 10:41:21 +01:00
Matt Westcott 4c29164206 Release notes / docs for new settings menu 2014-10-01 10:34:33 +01:00
Matt Westcott 9eb1eab31d Merge branch 'feature/settings-menu' 2014-10-01 10:09:20 +01:00
Matt Westcott 914fe108d1 Rename 'Editor's picks' to 'Promoted search results' in settings menu - fixes #646 2014-10-01 10:08:36 +01:00
Matt Westcott e14fa622a8 add missing styles to highlight redirects / editor's picks menu items 2014-10-01 10:04:10 +01:00
Matt Westcott ba10c7b45c remove unused and corrupted site_form.html 2014-10-01 09:48:30 +01:00
Dave Cranwell 2cc51015a3 styling updates to make html valid and better spacing of fields 2014-09-30 21:07:03 +01:00
Matt Westcott e12432b0c9 Move Sites to the settings menu (and use decorator syntax for hooks) 2014-09-30 20:59:56 +01:00
Matt Westcott 5a8a36aea6 add wagtailsites to INSTALLED_APPS in project template 2014-09-30 20:51:08 +01:00
Matt Westcott 3ea6b6c52a import hooks from wagtailcore, not wagtailadmin 2014-09-30 20:48:55 +01:00
Nick Smith 61d75f440d Switch to site icon and use td.title for hostname column 2014-09-30 17:29:33 +01:00
Nick Smith a5fbb74782 Add page chooser panel for site form root page field 2014-09-30 17:29:08 +01:00
Nick Smith 6d8344d7ef Add wagtailsites tests
Conflicts:
	runtests.py
2014-09-30 17:28:30 +01:00
Nick Smith f4afab58d6 More granular site perms, including hiding the Add/Delete buttons when not permitted 2014-09-30 17:26:44 +01:00
Nick Smith 776e3c4c7a Add site delete view 2014-09-30 17:26:34 +01:00
Nick Smith a45e8640b3 Add wagtailsites views, urls and templates
Conflicts:
	wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
2014-09-30 17:25:59 +01:00
Matt Westcott 60d5f22b04 oops, inherit the right version of render_as_field 2014-09-30 16:28:42 +01:00
Matt Westcott 941eed4813 fix BasePageChooserPanel to pass 'Chooser another page' / 'Choose a page' labels to the page_chooser_panel template 2014-09-30 16:08:24 +01:00
Matt Westcott bbdc785f4c skip test_duplicate_page_permissions_error test in wagtailusers (currently fails in Django 1.7, but not a showstopper for the feature) 2014-09-29 22:55:15 +01:00
Matt Westcott 7a2394cd8a move South migration uniqueness_constraint_on_group_page_permission to the right place; add equivalent Django 1.7 migration 2014-09-29 22:48:29 +01:00
Karl Hobley 5237dd4f0b Update 0.6.rst 2014-09-29 16:25:24 +01:00
Karl Hobley e9b7914faf Release note for register_signal_handlers move
Fixes #660
2014-09-29 16:23:57 +01:00
Matt Westcott 2eb17b7790 Merge branch 'feature/settings-menu' into feature/settings-menu-groups 2014-09-29 15:39:38 +01:00
Dave Cranwell 62aa7bff80 corrected font sizes and colours 2014-09-29 14:09:22 +01:00
Dave Cranwell a773803b45 corrected starting Y of explorer menu 2014-09-29 13:57:42 +01:00
Matt Westcott 4ac1a656a7 move Groups to settings menu 2014-09-26 18:00:52 +01:00
Matt Westcott 09c9872238 Merge branch 'integrated_django_admin_groups' of https://github.com/davecranwell/wagtail into feature/settings-menu-groups 2014-09-26 17:57:08 +01:00
Matt Westcott a93af785be Merge branch 'feature/settings-menu' into nimasmi-integrate_django_admin_groups
Conflicts:
	wagtail/wagtailadmin/static/wagtailadmin/scss/core.scss
	wagtail/wagtailadmin/wagtail_hooks.py
2014-09-26 17:50:41 +01:00
Matt Westcott f460547ab3 Merge branch 'integrate_django_admin_groups' of https://github.com/nimasmi/wagtail into nimasmi-integrate_django_admin_groups
Conflicts:
	wagtail/wagtailadmin/wagtail_hooks.py
	wagtail/wagtailcore/models.py
	wagtail/wagtaildocs/wagtail_hooks.py
	wagtail/wagtailimages/wagtail_hooks.py
	wagtail/wagtailsnippets/wagtail_hooks.py
	wagtail/wagtailusers/tests.py
	wagtail/wagtailusers/wagtail_hooks.py
2014-09-26 16:59:26 +01:00
Matt Westcott a8a46b45f5 Merge branch 'master' into feature/settings-menu 2014-09-26 16:05:03 +01:00
Matt Westcott f4e27a61bb update docs for register_settings_menu_item to indicate it's now scheduled for 0.7 2014-09-26 16:04:28 +01:00
Matt Westcott 504ddecde2 release note for #652 (and better description for the wagtail start bugfix) 2014-09-26 11:20:11 +01:00
Matt Westcott 85d1a496e1 release note for #652 2014-09-26 11:15:55 +01:00
Matt Westcott 6bc37bf1a1 Merge pull request #652 from kaedroho/image-frontend-cache-fix
Use cache_control decorator instead of cache_page
2014-09-26 11:08:22 +01:00
Karl Hobley 297ebd1148 PEP8 fix 2014-09-26 10:51:08 +01:00
Karl Hobley e292f87e53 Use cache_control decorator instead of cache_page
I used cache_page originally as it sets all the relevant HTTP headers
("Cache-Control" and "Expires") to ask browsers/proxys to cache the
generated image to reduce load.

What I didn't know at the time is that cache_page also inserts the
generated images into the cache backend. Sites with many images being
served thorugh the "Frontend URLs" mechanism could end up with their
cache servers being overloaded.

This pull request replaces the use of cache_page with cache_control
which doesn't insert the image into the cache.

Also, cache_control only sets the "Cache-Control" HTTP header (and not
"Expires"). As "Cache-Control" is defined in the HTTP 1.1 spec, I think
it's safe to assume that the vast majority of browsers and proxys
support it.
2014-09-26 10:44:44 +01:00
Karl Hobley 944fd8897f Release note for #651 2014-09-25 09:46:25 +01:00
Karl Hobley 618eb41922 Changelog for #651 2014-09-25 09:45:52 +01:00
Karl Hobley d6857b7749 Merge pull request #651 from gasman/fix/625
Invoke django-admin.py over Python API rather than as external executable - fixes #625
2014-09-25 09:44:32 +01:00
Matt Westcott 1d916ded1b Invoke django-admin through python API call rather than on the command line, to sidestep platform-specific issues with finding / launching executables - fixes #625 2014-09-25 00:13:29 +01:00
Dave Cranwell 5f09dd688c removed debugging 2014-09-23 10:27:02 +01:00
Dave Cranwell 70d263ce6e Fixing issue with inline panels used in non-content panels failing to display correctly due to use of :visible, which doesn't work as expected when content is already hidden at runtime 2014-09-23 10:26:15 +01:00
Matt Westcott 31cfabc275 update pypi classifier to Production / Stable 2014-09-22 21:11:22 +01:00