Commit graph

2091 commits

Author SHA1 Message Date
Matt Westcott
28592b4d9b Allow menu items to define their own javascript includes, and put the explorer menu js there rather than in core.js 2014-08-12 10:49:38 +01:00
Matt Westcott
ee71fff1b8 Convert all remaining menu items to be globally-registered with an is_shown method 2014-08-12 10:49:38 +01:00
Matt Westcott
3c1c2805c7 Add an is_shown() method to allow globally-registered menu items to specify whether or not they should be shown on a given request 2014-08-12 10:49:38 +01:00
Matt Westcott
4e2ebc2ad2 Add register_admin_menu_item hook for registering MenuItems globally 2014-08-12 10:49:38 +01:00
Matt Westcott
0926c90004 pass explorer-menu-url as a data attribute on the explorer menu link, so that we don't have to define it as a global in admin_base.html 2014-08-12 10:49:38 +01:00
Matt Westcott
d6f2b13284 Support passing html attributes into MenuItem 2014-08-12 10:49:37 +01:00
Matt Westcott
ce1aecb1d0 Merge branch 'chrxr-master' 2014-08-12 09:03:02 +00:00
Chris Rogers
82a3f8b732 reverted debian.sh 2014-08-11 19:28:25 +01:00
Chris Rogers
e7476cb709 added new screenshots, corrected some typos 2014-08-11 19:23:49 +01:00
Chris Rogers
bf1175523d Merge branch 'master' of https://github.com/torchbox/wagtail 2014-08-11 17:57:04 +01:00
pvetch
ab5ae2049e Update frontend_cache_purging.rst 2014-08-08 09:42:12 +01:00
Matt Westcott
20e5be9e0e remove redundant Deprecated Features heading from 0.5 release notes 2014-08-01 17:25:49 +01:00
Matt Westcott
8edff405dd prepare for 0.5 release 2014-08-01 17:01:42 +01:00
Matt Westcott
35a4c9a4a1 Merge branch 'master' of github.com:torchbox/wagtail 2014-08-01 16:54:55 +01:00
Matt Westcott
f0e853843f update url to uwsgi-init.d - fixes #522 2014-08-01 16:54:38 +01:00
Karl Hobley
9fea1f2306 Merge pull request #523 from kaedroho/translations
Translations for 0.5
2014-08-01 16:52:21 +01:00
Matt Westcott
13293da5cc remove reference to non-existent redirects documentation 2014-08-01 16:49:17 +01:00
Karl Hobley
bc0f1ce77b Rerun compilemessages 2014-08-01 16:48:19 +01:00
Matt Westcott
381ec5179e Added Copy Page to release notes / changelog 2014-08-01 16:46:27 +01:00
Karl Hobley
8d6ffad7ec Pulled translations from Transifex 2014-08-01 16:45:44 +01:00
Karl Hobley
f14662ae10 Rerun makemessages. Fixes #521 2014-08-01 16:42:18 +01:00
Matt Westcott
2579bc0ef4 Merge pull request #380 from kaedroho/page-copy-ui
Added page copy action to admin
2014-08-01 16:35:45 +01:00
Matt Westcott
455159378f Fix translations and pluralisation within CopyForm 2014-08-01 16:21:25 +01:00
Matt Westcott
a14f604142 Customise the label and help text of the 'publish copies' field when there are no subpages 2014-08-01 16:14:07 +01:00
Matt Westcott
858dd11cc6 Move the 'should we display the publish_copies checkbox' logic into CopyForm 2014-08-01 16:06:51 +01:00
Matt Westcott
37b8f22c4b Submit button on copy page should not say 'yes', because the form is not presented as an 'are you sure?' confirmation message 2014-08-01 15:40:34 +01:00
Matt Westcott
b5f63d13b1 Move the 'should we offer the copy_subpages checkbox or not' logic into CopyForm itself. This also allows us to move the help text into the actual help_text property, which fixes the dodgy spacing on the form field 2014-08-01 15:34:07 +01:00
Matt Westcott
0f8e3cbe57 Validate the slug field in CopyForm against invalid characters 2014-08-01 15:05:47 +01:00
Matt Westcott
e1d1fc917f get CopyForm to set its own initial values so that we don't have to pass them in 2014-08-01 14:59:39 +01:00
Matt Westcott
5bffa72c1a Pass 'page' to the constructor of CopyForm, so that we can define a slug validation method there rather than pushing one in from the view 2014-08-01 14:47:55 +01:00
Matt Westcott
9a86167f6e Hide the 'publish copies' checkbox if there is nothing to publish 2014-08-01 14:19:33 +01:00
Matt Westcott
f55a00fea9 Merge branch 'page-copy-ui' of https://github.com/kaedroho/wagtail into kaedroho-page-copy-ui
Conflicts:
	wagtail/wagtailadmin/tests/test_pages_views.py
2014-08-01 14:12:13 +01:00
Matt Westcott
100797796d make the check_old_style_urlconf not crash and burn if wagtailimages_serve has not been added to urls.py 2014-07-31 15:06:24 +01:00
Karl Hobley
722cc00385 Changelog and release notes for asset usage stats 2014-07-31 12:28:32 +01:00
Karl Hobley
de70f2ab89 Improved implementation of usage_count_enabled
Thanks to @gasman for spotting
2014-07-31 12:19:09 +01:00
Karl Hobley
1ac807ce09 Merge branch '146-display-calculated-usage'
Conflicts:
	wagtail/wagtailimages/models.py
	wagtail/wagtailimages/templates/wagtailimages/images/edit.html
	wagtail/wagtailimages/tests.py
	wagtail/wagtailimages/urls.py
	wagtail/wagtailimages/views/images.py
2014-07-31 12:17:16 +01:00
Karl Hobley
92e249bba2 Fixed typo 2014-07-31 11:32:27 +01:00
Karl Hobley
4cb6fb53be Fixed indentation in usage templates. Removed invalid section elements 2014-07-31 11:30:49 +01:00
Karl Hobley
0c425976ca Improvements to titles of images/docs/snippets usage pages 2014-07-31 11:20:46 +01:00
Karl Hobley
b02c26ef77 Various renames, API changes, etc 2014-07-31 11:20:41 +01:00
Karl Hobley
7fa86fe608 Made useage count link translatable 2014-07-31 11:05:23 +01:00
Matt Westcott
ea5550c6b3 Merge pull request #520 from precise54/fix-deprecation-warning
Fix deprecation warning for renamed wagtail_images
2014-07-31 09:32:14 +01:00
Karl Hobley
07bc13006b Merge pull request #519 from gasman/feature/fail-on-wagtailimages-urlconf-clash
Check for URL path clashes caused by pre-Wagtail-0.3 urlconfs that try to import wagtail.wagtailimages.urls as /admin/images/
2014-07-31 09:28:42 +01:00
Karl Hobley
3a55ca17da Removed a couple of stray backticks 2014-07-31 09:17:52 +01:00
David Smith
29ee70aa7e Fix deprecation warning for renamed wagtail_images 2014-07-31 16:40:48 +10:00
Matt Westcott
379d48e7a4 Check for URL path clashes in wagtailimages caused by a pre-wagtail-0.3 urlconf, and fail loudly if one is encountered 2014-07-30 22:24:22 +01:00
Matt Westcott
7589748141 Merge branch 'kaedroho-image-frontend-urls' 2014-07-30 19:31:40 +01:00
Matt Westcott
30142d6201 add release notes / changelog for using images outside wagtail 2014-07-30 19:12:51 +01:00
Matt Westcott
2158dd1fc0 Add upgrade considerations note about admin/images URLs 2014-07-30 19:12:51 +01:00
Matt Westcott
738e0a44b2 add gettingstarted back to docs index (removed by mistake) 2014-07-30 19:12:51 +01:00