Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-16 03:03:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1159 commits 30 branches 112 tags 89 MiB
Commit graph

1159 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Talbot
e87190f5bb Update edit handlers unit tests 
Add more tests. Clean up modified class properties after tests finish.
Replace assertRegexpMatches with assertIn.
 2014-06-19 17:23:36 +01:00
Tom Talbot
cd06b2c6e2 Remove broken test 2014-06-18 17:33:20 +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
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
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
Karl Hobley
3577e61880 Raise exception if userbar views are accessed by anonymous user 2014-06-18 15:58:22 +01:00
Karl Hobley
9c0f4212e3 Only allow logged in users to access the userbar views 2014-06-18 15:49:02 +01:00
Dave Cranwell
ace28dd602 move preview css to scss file 2014-06-18 11:26:11 +01:00
Dave Cranwell
01df448796 Merge branch 'master' into feature/minor-preview-improvement 2014-06-18 11:06:12 +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
Dave Cranwell
53cfd94484 Merge remote-tracking branch 'upstream/master' into feature/styleguide 2014-06-17 09:51:11 +01:00
Karl Hobley
7bb37d4efb Cleaned up wagtailembeds/tests.py imports 2014-06-17 09:49:57 +01:00
Dave Cranwell
0f6b6784dc fixing incorrect test import 2014-06-17 09:45:42 +01:00
Dave Cranwell
b638cc01e9 Merge branch 'master' into feature/styleguide 2014-06-17 09:36:21 +01:00
Dave Cranwell
7184d6f6d2 font tweaks 2014-06-16 17:28:42 +01:00
Dave Cranwell
2bd1e0076b tweaks to font metrics 2014-06-16 17:10:26 +01:00
Dave Cranwell
506d977950 typo in comment 2014-06-16 15:32:32 +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
dae521aec8 removed redundant script block 2014-06-13 17:21:51 +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
Dave Cranwell
72a43567d2 tweaked transition 2014-06-13 16:15:37 +01:00
Dave Cranwell
438ce4aba5 improvements from kaedroho feedback 2014-06-13 15:40:06 +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