Commit graph

2553 commits

Author SHA1 Message Date
Dave Cranwell
311156a757 Merge remote-tracking branch 'upstream/master' 2014-06-27 11:56:27 +01:00
Karl Hobley
e0fb57d718 Minor coding style fix 2014-06-27 11:52:02 +01:00
Dave Cranwell
97e815903e replacing lines from another botched merge 2014-06-27 11:49:55 +01:00
Karl Hobley
a445877c21 Merge pull request #329 from kaedroho/new-queryset-methods
Added in_menu and not_in_menu methods to PageQuerySet
2014-06-27 11:46:53 +01:00
Dave Cranwell
2dd991af53 updating styling of chooser submit buttons 2014-06-27 11:42:13 +01:00
Tom Talbot
58ee0e97ef Tidy up embed tests 2014-06-27 11:34:27 +01:00
Dave Cranwell
38da164067 Merge remote-tracking branch 'upstream/master' 2014-06-27 11:33:53 +01:00
Karl Hobley
e85e723f8f Make get_next/prev_siblings take an inclusive flag 2014-06-27 11:33:05 +01:00
Dave Cranwell
8bf19b923c merged button fixes with master 2014-06-27 11:32:54 +01:00
Dave Cranwell
1f28de4cf8 tweaks to unify button presentation cross-browser 2014-06-27 11:31:52 +01:00
Karl Hobley
8416af159a Changes to get_next/prev_siblings tests 2014-06-27 11:30:15 +01:00
Karl Hobley
e3ccb7166d Added changelog entry for #301 2014-06-27 11:26:08 +01:00
Karl Hobley
95124cc9e8 Merge branch 'master' into published_pagination 2014-06-27 11:24:59 +01:00
Nick Smith
781aabad97 Update Site.find_for_request to respect https 2014-06-27 11:18:24 +01:00
Nick Smith
ee9297b445 Update Site.objects.get_by_natural_key() to include port 2014-06-27 11:18:24 +01:00
Nick Smith
eccb87d9a0 Add routing test for when two sites have the same hostname but different ports 2014-06-27 11:18:24 +01:00
Nick Smith
49cb5b1025 Allow multiple sites with the same hostname but different ports; resolves #290 2014-06-27 11:18:24 +01:00
Nick Smith
40ac053e5d Implement field validation for Site.is_default_site; resolves #289 2014-06-27 11:18:24 +01:00
Karl Hobley
fe45b4e424 Replaced get_query_set with get_queryset for in_menu methods 2014-06-27 11:17:13 +01:00
Karl Hobley
1840ecb672 Added in_menu and not_in_menu methods to PageQuerySet 2014-06-27 11:17:13 +01:00
Karl Hobley
de219e7108 Fixed broken test
Forgot to update this in 1f67f7bbd9
2014-06-27 11:10:50 +01:00
Karl Hobley
9079d67392 Changelog entry for notification preferences 2014-06-27 10:59:15 +01:00
Karl Hobley
4107afc2f2 Merge branch 'notification_preferences' 2014-06-27 10:57:42 +01:00
Karl Hobley
ad3737e7d7 Merge pull request #304 from jeffrey-hearn/docs-wagtail-app-config
Docs: Wagtail settings variables and urlconfs
2014-06-27 10:54:07 +01:00
Karl Hobley
1f67f7bbd9 Don't filter by owner in publishable_pages 2014-06-27 10:40:00 +01:00
Karl Hobley
402641bf6c Made wagtailusers work a bit nicer with custom user models 2014-06-27 10:38:47 +01:00
Karl Hobley
1ba1cad3f6 Changed User.get_profile to UserProfile.get_for_user 2014-06-27 10:38:31 +01:00
Dave Cranwell
5c44dcc622 Merge pull request #361 from takeflight/feature/admin-stats-links
Make links out of the admin home page 'X Pages/Images/Documents' stats
2014-06-27 09:31:11 +01:00
Dave Cranwell
b73dc91898 fixing buttons (incomplete) 2014-06-27 09:24:53 +01:00
Tim Heap
b2e6ce177b Remove unused import added in 66dce8d 2014-06-27 08:35:11 +10:00
Dave Cranwell
ccc533831f improving contrast of actions buttons in listings over hover colour 2014-06-26 16:41:51 +01:00
Karl Hobley
1a0ffa799d Added unicode method to PageRevision 2014-06-26 14:49:18 +01:00
Karl Hobley
deb2e0f9d8 Deprecate Page.get_other_siblings 2014-06-26 14:42:06 +01:00
Karl Hobley
a15939add6 Make Page.specific and Page.specific_class cached properties 2014-06-26 14:39:06 +01:00
Karl Hobley
d89398f214 Cleanup Page.get_latest_revision_as_page 2014-06-26 14:38:29 +01:00
Karl Hobley
c7c001c9fe Cleanup Page.get_latest_revision 2014-06-26 14:34:36 +01:00
Karl Hobley
e1bc2425b6 Return new revision object from Page.save_revision 2014-06-26 14:34:36 +01:00
Karl Hobley
0c34959bf5 Simplified UserPagePermissionsProxy.editable_pages method 2014-06-26 14:34:18 +01:00
Karl Hobley
f888a8ee47 Added page copy action to admin 2014-06-26 14:23:10 +01:00
Karl Hobley
bf03c05fa2 Changed **kwargs to update_attrs 2014-06-26 14:21:18 +01:00
Karl Hobley
1367669685 Make sure we have the most specific version of a page before copying child objects 2014-06-26 14:10:55 +01:00
Karl Hobley
98effcb4d7 Minor cleanup 2014-06-26 13:56:17 +01:00
Karl Hobley
74d1555ac1 Fixed bug causing child objects of child pages to not be copied 2014-06-26 13:55:25 +01:00
Karl Hobley
b9993a8c1e Page copy now copies child objects 2014-06-26 09:51:50 +01:00
Karl Hobley
069406f86b Implemented recursive copying 2014-06-26 09:45:51 +01:00
Karl Hobley
39f9b9b0c2 Renamed 'duplicate' to 'copy' 2014-06-26 09:34:42 +01:00
Karl Hobley
40ca017c36 Started work on page duplication 2014-06-25 17:31:03 +01:00
Tom Talbot
49d377a70f Add image format tests 2014-06-25 17:21:41 +01:00
Tom Talbot
e101e0aff6 Merge branch 'master' into even-more-unit-tests 2014-06-25 16:18:08 +01:00
Tom Talbot
cdd3144107 Add more embeds tests 2014-06-25 16:15:57 +01:00