Commit graph

2553 commits

Author SHA1 Message Date
Karl Hobley
dd89d2d29e Merge pull request #331 from kaedroho/tests-changes2
Tests changes
2014-06-19 14:04:56 +01:00
Dave Cranwell
62fc679720 further tweaks to colours and form layout 2014-06-19 13:47:09 +01:00
Dave Cranwell
d1b321f859 made red more distinct from salmon 2014-06-19 13:33:48 +01:00
Dave Cranwell
6a33834d29 ongoing styling of tabs an publishing fields, inc introduction of salmon colour 2014-06-19 13:30:39 +01:00
Dave Cranwell
03ce91c992 Update CONTRIBUTORS.rst 2014-06-19 12:28:07 +01:00
Dave Cranwell
59e161ad9d updates to edit page 2014-06-19 12:25:53 +01:00
Karl Hobley
879269ab20 Added versionchanged notes to docs 2014-06-19 11:22:58 +01:00
Karl Hobley
f73c7da772 Update docs to import tags from correct tags module 2014-06-19 11:17:32 +01:00
Karl Hobley
6c54fc55d1 Merge remote-tracking branch 'torchbox/master' into scheduled-publishing
Conflicts:
	wagtail/wagtailadmin/edit_handlers.py
	wagtail/wagtailadmin/views/pages.py
	wagtail/wagtailcore/models.py
	wagtail/wagtailcore/tests.py
2014-06-19 11:07:36 +01:00
Karl Hobley
008b3238ab Moved image_tags to wagtailimages_tags 2014-06-19 10:41:53 +01:00
Karl Hobley
b3e7951932 Moved embed_filters to wagtailembeds_tags 2014-06-19 10:39:50 +01:00
Karl Hobley
65ec6d77e8 Merged richtext tags into wagtailcore_tags 2014-06-19 10:36:03 +01:00
Karl Hobley
122abc9a8c renamed rich_text tags to wagtailrichtext_tags 2014-06-19 10:30:09 +01:00
Karl Hobley
9a5954607d Renamed pageurl tags to wagtailcore_tags 2014-06-19 10:28:56 +01:00
Karl Hobley
58ed918129 Merge pull request #330 from kaedroho/wagtailcore-cleanup
Wagtailcore cleanup
2014-06-19 10:14:19 +01:00
Tom Talbot
cd06b2c6e2 Remove broken test 2014-06-18 17:33:20 +01:00
Karl Hobley
d95763251d Corrected names of userbar tests 2014-06-18 17:29:24 +01:00
Tom Talbot
61290d90a9 Merge branch 'master' into edit-handlers-unit-tests
Conflicts:
	wagtail/wagtailadmin/edit_handlers.py
2014-06-18 17:29:01 +01:00
Dave Cranwell
06dc598d0a Update CHANGELOG.txt 2014-06-18 17:25:58 +01:00
Karl Hobley
778c699151 Merge branch 'master' into tests-changes2 2014-06-18 17:25:47 +01:00
Karl Hobley
9a1da28c38 Changelog entries for #236, #286 and #315 2014-06-18 17:22:46 +01:00
Tom Dyson
e40dea8d28 wagtail -> Wagtail in contributing.rst 2014-06-18 17:17:14 +01:00
Tom Talbot
3778c476bb Add unit tests for edit_handlers.py. Lint edit_handlers.py. 2014-06-18 17:16:04 +01:00
Karl Hobley
f53ebfd7a9 Merge pull request #236 from davecranwell/feature/styleguide
Addition of a styleguide, for logged in users only and not publicly linked.
2014-06-18 17:04:44 +01:00
Dave Cranwell
f6eefb02b1 merge conflict resolved 2014-06-18 16:56:05 +01:00
Dave Cranwell
20ac4ead44 begun styling and refactoring to work in the way we want 2014-06-18 16:54:31 +01:00
Dave Cranwell
d34c504ba3 Merge pull request #286 from kaedroho/new-datetime-picker
New datetime picker
2014-06-18 16:53:24 +01:00
Dave Cranwell
c14ce44503 Merge pull request #315 from davecranwell/feature/minor-preview-improvement
Aesthetic improvements to preview experience.
2014-06-18 16:53:11 +01:00
Robert Clark
733294cafa return a queryset instead of the first sibling 2014-06-18 11:04:39 -04:00
Karl Hobley
ed4af844de Added tests for userbar 2014-06-18 15:58:54 +01:00
Karl Hobley
3577e61880 Raise exception if userbar views are accessed by anonymous user 2014-06-18 15:58:22 +01:00
Robert Clark
6ce38148b0 Merge branch 'master' of https://github.com/torchbox/wagtail into published_pagination 2014-06-18 10:52:02 -04:00
Karl Hobley
e76785d96d Merge branch 'master' into tests-changes2 2014-06-18 15:49:26 +01:00
Karl Hobley
9c0f4212e3 Only allow logged in users to access the userbar views 2014-06-18 15:49:02 +01:00
Karl Hobley
cbc401befe Deleted test to test query popularity over time (not implemented) 2014-06-18 14:50:42 +01:00
Karl Hobley
e220c77cc0 Added test to test reordering of editors picks 2014-06-18 14:20:42 +01:00
Karl Hobley
a05df1a534 Added posting tests to editors picks 2014-06-18 13:39:12 +01:00
Karl Hobley
620e58632f General improvements to editorspicks tests 2014-06-18 13:08:54 +01:00
Karl Hobley
ec46d09772 Improved editors picks pagination tests 2014-06-18 13:05:33 +01:00
Karl Hobley
929aa0f5e8 Added posting tests to wagtaildocs 2014-06-18 12:26:15 +01:00
Karl Hobley
bf84b7f64a Removed get method from wagtaildocs tests 2014-06-18 11:57:37 +01:00
Karl Hobley
1ca6de4d46 Improvements to wagtaildocs pagination tests 2014-06-18 11:54:12 +01:00
Dave Cranwell
4b7c10bb5c -amremoving test 2014-06-18 11:42:11 +01:00
Dave Cranwell
fc9f001e71 test 2014-06-18 11:39:32 +01:00
Karl Hobley
46fc45877c Replaced get_query_set methods with get_queryset 2014-06-18 11:27:34 +01:00
Dave Cranwell
ace28dd602 move preview css to scss file 2014-06-18 11:26:11 +01:00
Karl Hobley
c46ab6c209 Renamed wagtailcore.util to wagtailcore.utils 2014-06-18 11:24:38 +01:00
Dave Cranwell
01df448796 Merge branch 'master' into feature/minor-preview-improvement 2014-06-18 11:06:12 +01:00
Matt Westcott
eddb060c8d Bypass 'choose a page type' screen when there is only one available choice in subpage_types 2014-06-17 23:08:30 +01:00
Matt Westcott
6bfe82f5e5 Make can_add_subpage and can_publish_subpage permission checks return False for page models that disallow subpages; this ensures that 'add child page' links are not shown 2014-06-17 22:53:54 +01:00