Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-15 04:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1096 commits 30 branches 112 tags 89 MiB
Commit graph

1096 commits

This branch
This branch
All branches
Author SHA1 Message Date
Karl Hobley
c46ab6c209 Renamed wagtailcore.util to wagtailcore.utils 2014-06-18 11:24:38 +01:00
Matt Westcott
8f9298f2b4 Changelog / contributors entry for #243 2014-06-17 22:03:11 +01:00
Matt Westcott
86aa13f066 Merge branch 'master' of github.com:torchbox/wagtail 2014-06-17 21:57:41 +01:00
Matt Westcott
9071a8e004 Tweak subpage_types logic so that subpage_types=None (or undefined) means 'no restriction on subpages', freeing up [] to mean 'no subpages allowed' 2014-06-17 21:48:48 +01:00
Matt Westcott
8d3ac405c4 Deprecate get_leaf_page_content_type_ids and get_navigable_page_content_type_ids, as they have incorrect semantics for page subclasses that don't define subpage_types. Replace them with a naive implementation that doesn't require metaclass hacks 2014-06-17 21:27:26 +01:00
Matt Westcott
a2254148e9 Remove subpage_types logic from is_navigable and get_navigation_menu_items. It's now clear that we will never mandate the use of subpage_types, so we can't use its presence or absence as an indicator of whether or not a page is appropriate to be included in navigation menus. 2014-06-17 20:40:55 +01:00
Matt Westcott
f2b5e30de4 Merge pull request #321 from kaedroho/issue-320 
Set treebeard attributes in preview on create view. Fixes #320
 2014-06-17 16:35:46 +01:00
Matt Westcott
5987f2843a remove redundant imports from wagtailcore/models.py 2014-06-17 14:56:44 +01:00
Matt Westcott
f56179f8ba Merge branch 'business-rules' of https://github.com/lojack/wagtail into lojack-business-rules 
Conflicts:
	wagtail/tests/models.py
	wagtail/wagtailadmin/tests.py
 2014-06-17 14:45:25 +01:00
Karl Hobley
7bb37d4efb Cleaned up wagtailembeds/tests.py imports 2014-06-17 09:49:57 +01:00
Karl Hobley
4136bb5053 Added tests for db6bb92 2014-06-16 15:15:38 +01:00
Karl Hobley
db6bb920fb Set treebeard attributes in preview on create view. Fixes #320 2014-06-16 14:57:33 +01:00
Dave Cranwell
7f72bdd917 Merge remote-tracking branch 'upstream/master' into feature/better-modals 2014-06-16 13:19:45 +01:00
Dave Cranwell
bd0a18dc13 tidied image chooser.js 2014-06-16 13:18:27 +01:00
Dave Cranwell
ba15fbead1 added better comments. tweaked when modal is shown 2014-06-16 13:06:02 +01:00
Dave Cranwell
b5dc5a9516 tweaks to make modals fade better 2014-06-16 12:59:43 +01:00
Karl Hobley
5bfa8d6b07 Merge pull request #291 from kaedroho/issue-25 
Made login view redirect already logged in users to dashboard.
 2014-06-16 12:10:17 +01:00
Karl Hobley
ee222a387b Merge remote-tracking branch 'torchbox/master' into issue-25 
Conflicts:
	runtests.py
 2014-06-16 10:40:31 +01:00
Karl Hobley
614cd6d028 Merge pull request #281 from kaedroho/tests-changes 
Tests changes
 2014-06-16 10:38:52 +01:00
Karl Hobley
4235450f5e Minor PEP8 fix 2014-06-16 10:31:05 +01:00
Karl Hobley
02b4223e41 Improvements to page chooser tests 2014-06-16 10:28:59 +01:00
Karl Hobley
1d7cc2b3aa Merge branch 'master' into tests-changes 
Conflicts:
	wagtail/wagtailembeds/tests.py
	wagtail/wagtailsnippets/tests.py
 2014-06-16 10:23:21 +01:00
Karl Hobley
aef892dc5b Merge pull request #311 from helenwarren/master 
Fix behaviour described in issue 77. Specifically validate that for an e...
 2014-06-16 10:08:08 +01:00
Karl Hobley
a60af70dfe Docs fix: Elasticutils 0.9+ is not supported 2014-06-16 09:49:01 +01:00
Neal Todd
7a709709e9 Doc fix - use https rather than ssh for wagtaildemo clone 2014-06-16 09:39:06 +01:00
Dave Cranwell
16ca198377 Merge remote-tracking branch 'upstream/master' 2014-06-13 17:09:46 +01:00
Dave Cranwell
d6aa265666 all fields now display required asterisk when necessary 2014-06-13 17:08:56 +01:00
Karl Hobley
213df7c4f3 Merge pull request #316 from mope/313-query-string-crash 
Truncate long search strings
 2014-06-13 14:44:18 +01:00
Tom Talbot
cc2d8b6873 Truncate long search strings 
Search query strings must not exceed 255 characters; they will be
truncated if they do. Also added embedly library for Travis.
 2014-06-13 14:18:16 +01:00
Karl Hobley
25b7bf598e Merge pull request #314 from mope/whitelist-tests 
Add unit tests for wagtailcore/whitelist.py
 2014-06-13 11:49:15 +01:00
Tom Talbot
ff5879def9 Add unit tests for wagtailcore/whitelist.py 2014-06-13 10:24:32 +01:00
Tom Dyson
89f5ada464 Merge pull request #310 from sixpearls/docs/image_formats 
Adding basic documentation for the image_formats feature.
 2014-06-13 09:16:13 +01:00
Matt Westcott
8368837e2c fix styling of preview button on create page when there are multiple preview modes 2014-06-12 16:52:52 +01:00
Dave Cranwell
7a290ead90 margin causing problems in login screen solved 2014-06-12 14:09:47 +01:00
Helen Warren
362cdbfc08 Merge branch 'master' of github.com:torchbox/wagtail 2014-06-12 12:17:29 +01:00
Dave Cranwell
e2dd56a822 Merge pull request #308 from takeflight/master 
Removed _blank from recently edited items screen
 2014-06-11 21:37:08 +01:00
Karl Hobley
58f8bef4b1 Merge pull request #287 from mope/more-unit-tests 
Unit tests for wagtail admin chooser and embeds
 2014-06-11 14:19:44 +01:00
Matt Westcott
ef16c7a943 Merge branch 'kaedroho-get_context-args-kwargs' 2014-06-11 12:01:35 +01:00
Matt Westcott
3767070169 Merge branch 'get_context-args-kwargs' of https://github.com/kaedroho/wagtail into kaedroho-get_context-args-kwargs 2014-06-11 11:58:56 +01:00
Helen Warren
6eec08dfbe Fix behaviour described in issue 77. Specifically validate that for an editors pick a search term/phrase must be defined and at least one valid page recommendation specified. 2014-06-11 11:51:33 +01:00
Tom Talbot
04ca623c96 Merge branch 'master' into more-unit-tests 2014-06-11 11:02:45 +01:00
Tom Talbot
200854b705 Move chooser tests from tests.py to test_page_chooser.py 2014-06-11 10:59:27 +01:00
Tom Talbot
9d98eeefb8 Fix embedly key referenced before assignment 2014-06-11 10:46:29 +01:00
Karl Hobley
f5487e8076 Added some missing changelog entries 2014-06-11 09:23:09 +01:00
Ben Margolis
546f18cbb5 Adding basic documentation for the image_formats feature. 2014-06-10 18:53:43 -07:00
jonny
da8ee99a3e Removed _blank from recently edited items screen 2014-06-11 09:40:30 +10:00
Matt Westcott
a989824b9b Merge branch 'kaedroho-image-backend-tweaks' 2014-06-10 15:52:51 +01:00
Matt Westcott
b8cb6f8dcf Merge branch 'image-backend-tweaks' of https://github.com/kaedroho/wagtail into kaedroho-image-backend-tweaks 2014-06-10 15:45:20 +01:00
Dave Cranwell
7237abf185 Merge remote-tracking branch 'upstream/master' 2014-06-10 15:42:57 +01:00
Dave Cranwell
4ee43f79a0 fixing breadcrumb position on mobile 2014-06-10 15:42:34 +01:00