Commit graph

9387 commits

Author SHA1 Message Date
hanpama
0f4514752c Pull and Merge torchbox master 2015-08-07 21:17:34 +09:00
hanpama
3723a15eec Edit some comments 2015-08-07 21:12:54 +09:00
hanpama
407f18a922 Write testcase for delete submission view 2015-08-07 21:07:22 +09:00
Karl Hobley
337a979257 #1582 - Fix typo in model reference 2015-08-05 14:13:00 +01:00
Karl Hobley
5b123ca5f4 Deterministic ordering for tags 2015-08-03 20:27:22 +01:00
Karl Hobley
1d0fa2a3bf Various tweaks and fixes 2015-08-03 20:24:51 +01:00
Tom Dyson
7c784dec70 Merge pull request #1581 from nimasmi/multiple-page-types-in-page-chooser
Multiple page types in page chooser
2015-08-03 20:18:21 +01:00
Karl Hobley
fdb3e4905e Merge pull request #1576 from kaedroho/issue/1574
Removed references to search picks from project template
2015-08-03 20:09:52 +01:00
Karl Hobley
6d92ca4f3a Moved page model specific check into PageSerializer 2015-08-03 20:01:26 +01:00
Karl Hobley
c2706ac6d4 Split serialize_fields out of to_representation
Makes some code look a bit better
2015-08-03 19:49:08 +01:00
Karl Hobley
2a79ee7b09 serialize_object_metadata => serialize_meta 2015-08-03 19:40:54 +01:00
Karl Hobley
f669166128 serialize_object is now to_representation 2015-08-03 19:39:31 +01:00
Karl Hobley
b3ca0412f5 Merged BaseSerializer with WagtailSerializer
Previously, WagtailSerializer and it's subclasses were responsible for serializing objects and it delegated serializing the dynamic fields to automatically generated subclasses of BaseSerializer.

Now, these have been merged and all serializers are generated automatically for a particular request. The responsibility of generating the serializers is now in the endpoint.
2015-08-03 19:38:08 +01:00
Karl Hobley
32d0170882 Moved responsibility of getting fields for request to endpoint 2015-08-03 19:08:24 +01:00
Nick Smith
b67426c86b Merge branch 'master' into multiple-page-types-in-page-chooser
Conflicts:
	wagtail/wagtailadmin/views/chooser.py
2015-08-03 18:11:38 +01:00
Nick Smith
38ee0991e6 Update #1533 according to feedback: docs and error message changes 2015-08-03 18:08:20 +01:00
Karl Hobley
2d691cd6e7 Simplified handling of show_details flag in serializers 2015-08-03 17:20:30 +01:00
Karl Hobley
b4d0a6aded Simplified handling of request object in serializers 2015-08-03 17:17:11 +01:00
Karl Hobley
0b77112bf3 Moved get_serializer_field logic into base serializer class 2015-08-03 17:16:41 +01:00
Karl Hobley
199f15f3a3 Cleanup get_serializer_fields 2015-08-03 14:52:54 +01:00
Karl Hobley
fd821179cd Merge pull request #1580 from benebun/patch-1
Fix typo templage > template
2015-08-03 14:38:10 +01:00
Karl Hobley
f1f73461c5 Goodbye, get_api_data 2015-08-03 14:37:27 +01:00
Karl Hobley
a353f803e9 Use rest frameworks serializers 2015-08-03 14:37:27 +01:00
Karl Hobley
85a4209893 Use rest frameworks fields API 2015-08-03 14:37:26 +01:00
Karl Hobley
4523f8b5cc Refactored get_api_data into classes 2015-08-03 14:37:26 +01:00
Karl Hobley
30408252ff Contributor/changelog/release note for #1538 2015-08-03 14:35:58 +01:00
Benedikt Breinbauer
ea77a0f7b9 Fix typo templage > template 2015-08-03 15:35:32 +02:00
Karl Hobley
94ad915fee Merge pull request #1538 from tomchristie/rest-framework
Refactor API to REST framework.
2015-08-03 14:33:49 +01:00
Karl Hobley
62a5f4125e Removed references to search picks from project template
Fixes #1574
2015-08-03 10:19:29 +01:00
Karl Hobley
c553a122eb Merge pull request #1575 from theju/master
Update the urls to make use of namespaced URLs
2015-08-02 22:44:24 +01:00
Thejaswi Puthraya
31867e74c0 Update the urls to make use of namespaced URLs 2015-08-02 16:49:25 +00:00
Karl Hobley
9efb91d406 Fixed a couple of references to editors picks
Requires translation sources to be regenerated
2015-08-02 11:18:15 +01:00
Karl Hobley
3afeff8e15 Merge pull request #1570 from gasman/fix/remove-urlconf-check
Remove check for pre-Wagtail-0.3 urlconfs in wagtailimages
2015-08-01 12:04:50 +01:00
Matt Westcott
ea2cabca98 Release note for #1492 2015-08-01 11:22:59 +02:00
Matt Westcott
943310d097 add forgotten changelog items 2015-08-01 11:20:21 +02:00
Matt Westcott
0964a7f6b6 Merge pull request #1492 from kaedroho/es-index-chunked-rebuild
Rebuild search indices in chunks
2015-08-01 11:16:57 +02:00
Matt Westcott
f51412e764 Merge branch 'kaedroho-es-index-atomic-rebuild' 2015-08-01 11:14:08 +02:00
Matt Westcott
bd59ee93b6 Release note for #1490 2015-08-01 11:13:46 +02:00
Matt Westcott
55c3606b16 Merge branch 'es-index-atomic-rebuild' of https://github.com/kaedroho/wagtail into kaedroho-es-index-atomic-rebuild 2015-08-01 10:52:20 +02:00
Matt Westcott
955f751965 Remove check for Wagtail-0.3-style urlconfs in wagtailimages 2015-08-01 00:01:08 +02:00
Karl Hobley
1c1a9b01df Fix typos 2015-07-31 11:29:11 +01:00
Karl Hobley
f341d3c5f1 Various tweaks to update_index 2015-07-31 11:27:20 +01:00
Tim Heap
cb2146930b Refactor search index chunk updating 2015-07-31 11:27:20 +01:00
Karl Hobley
e5bb7f990e Implemented chunked index rebuilding 2015-07-31 11:27:20 +01:00
Karl Hobley
220bcbdf19 Fix Typo 2015-07-31 11:18:11 +01:00
Karl Hobley
a5d4be90d3 Create new alias at the finish() stage
https://github.com/torchbox/wagtail/pull/1490#discussion_r35779487
2015-07-31 11:16:25 +01:00
Matt Westcott
a679d4f7f5 Remove all menu-{section_name} classnames on the <body> element and menu item <li>s.
These were introduced in 9d7d016b7c to support menu item highlighting, but this mechanism was superseded by #1186. There's no sign of any code still using these classnames, and any code that relies on them would be liable to fail on non-English-language sites anyhow (since the menu item name is derived from the label by default, and the label is a translatable string).
2015-07-30 23:19:12 +01:00
Matt Westcott
1005e2885f Release note and upgrade consideration for #1235 2015-07-29 11:59:10 +01:00
Matt Westcott
9dff7a21ef Merge pull request #1235 from kaedroho/searchpicks-module
Search promotions module
2015-07-29 11:52:42 +01:00
Karl Hobley
488fcfc8d2 Changelog/release note for #1540 2015-07-28 11:26:49 +01:00