Commit graph

2631 commits

Author SHA1 Message Date
Tom Talbot
1a986bab0d Add unit tests for rich_text.py 2014-06-24 10:26:44 +01:00
Karl Hobley
3bef7bf302 Merge branch 'master' into feature/template-tags-rationalisation
Conflicts:
	docs/building_your_site/frontenddevelopers.rst
	wagtail/wagtailimages/templatetags/image_tags.py
2014-06-24 09:57:54 +01:00
Matt Westcott
4c77a4b18a Merge pull request #343 from kaedroho/searchchanges/elasticsearchresults-refactor
Search Changes 2 - Refactor ElasticSearchResults class
2014-06-24 09:55:29 +01:00
Karl Hobley
bdbcf3cd99 Updated deprecation warning messages of moved template tags libraries 2014-06-24 09:53:41 +01:00
Karl Hobley
3c1883bca0 Put prefetch related back in database backend 2014-06-24 09:42:31 +01:00
Karl Hobley
d25b6fb6c0 Put prefetch_related back 2014-06-24 09:14:42 +01:00
Tim Heap
66dce8df03 Make the 'X Pages/Images/Documents' stats links
They link to the relevant sections of the admin, allowing for quick
jumping around.
2014-06-24 17:12:10 +10:00
Robert Clark
64eed96841 moved tests to page model instead of queryset 2014-06-23 11:40:25 -04:00
Karl Hobley
765657329e Changelog entry for #342 2014-06-23 14:28:36 +01:00
Karl Hobley
2801c913dc Docs update for #342 merge 2014-06-23 14:22:50 +01:00
Matt Westcott
766f14e709 Merge pull request #342 from kaedroho/searchchanges/ditch-elasticutils
Search Changes 1 - Ditch ElasticUtils
2014-06-23 14:11:24 +01:00
Karl Hobley
d76c8613fb Added get_sitemap_urls method to page and use it in sitemaps 2014-06-23 14:08:42 +01:00
Karl Hobley
d0fefc5f97 Merge branch 'master' into sitemaps
Conflicts:
	runtests.py
2014-06-23 13:45:37 +01:00
Karl Hobley
ee7aebc9da Added tests for sitemaps 2014-06-23 13:43:34 +01:00
Karl Hobley
8e1b2cf019 Sitemap timeout can now be configured with a setting 2014-06-23 13:43:21 +01:00
Nick Smith
dd7344d65d Add tests for notification preferences views' being filtered for less privileged users 2014-06-23 13:17:58 +01:00
Nick Smith
f910b1dbe8 Only show the link to notification preferences if the user has preferences to set 2014-06-23 13:17:57 +01:00
Nick Smith
0cb60d6e27 Add UserPagePermissionsProxy tests for a user who can access the admin only 2014-06-23 13:17:57 +01:00
Nick Smith
d12c9181f5 Filter notification preferences form fields according to user permissions 2014-06-23 13:17:57 +01:00
Nick Smith
88b9f21287 Add tests for new UserPagePermissionsProxy methods 2014-06-23 13:17:57 +01:00
Nick Smith
16f1a44969 Add extra UserPagePermissionsProxy methods:
- can_edit_pages
    - publishable_pages
    - can_publish_pages
2014-06-23 13:17:57 +01:00
Nick Smith
c0a925b40d Add tests that notification preferences are respected;
also move existing notification tests to the new test case
2014-06-23 13:17:57 +01:00
Nick Smith
47b0ffc9e2 Add tests for notification preferences view 2014-06-23 13:15:25 +01:00
Nick Smith
64058c989a Add userprofile creation method tests 2014-06-23 13:15:24 +01:00
Nick Smith
4ce37c2653 Add link to notification preferences at bottom of email templates 2014-06-23 13:15:24 +01:00
Nick Smith
7822d49431 Implement checking of user notification preferences before send_notification() 2014-06-23 13:15:24 +01:00
Nick Smith
6dcb489d6b Add notification preferences form, view, template and link from account 2014-06-23 13:15:24 +01:00
Nick Smith
77da60b6d3 Add UserProfile model 2014-06-23 13:15:23 +01:00
Karl Hobley
acd27306a8 Merge pull request #328 from gasman/feature/subpage_types_niceties
Additional UX/workflow niceties when subpage_types is in use
2014-06-23 09:42:47 +01:00
Dave Cranwell
307ad3462a tweak 2014-06-20 17:27:56 +01:00
Dave Cranwell
e1155c32ef elegant preview now only available for non-IE because jquery can't adequately talk to child windows in IE. 2014-06-20 17:24:27 +01:00
Matt Westcott
b8c0594fdf Merge branch 'kcl-ddh-master' 2014-06-20 16:14:25 +01:00
Matt Westcott
f4c51d8205 add changelog entry for construct_whitelister_element_rules hook 2014-06-20 16:10:03 +01:00
Matt Westcott
1aab35ba24 add documentation for the construct_whitelister_element_rules hook 2014-06-20 16:08:50 +01:00
Matt Westcott
505a1291a8 Move construct_whitelister_element_rules hook logic into DbWhitelister, as the whitelist module should be Wagtail-agnostic 2014-06-20 15:22:54 +01:00
Matt Westcott
9bc770d0a6 Add unit tests for DbWhitelister, including ability to override the whitelist via hooks 2014-06-20 15:21:31 +01:00
jmiguelv
2afb13667f Added a new hook to add new element rules to the Whitelister. 2014-06-20 15:21:31 +01:00
Matt Westcott
0ea934566f Merge branch 'master' of github.com:torchbox/wagtail 2014-06-20 14:08:57 +01:00
Matt Westcott
55cd5aad83 Revert frame-writing stuff from #315, as it fails when the preview loads before the placeholder - see https://github.com/torchbox/wagtail/pull/315#issuecomment-46669595 2014-06-20 14:08:49 +01:00
Dave Cranwell
ba0805e521 Update frontenddevelopers.rst
typo fix
2014-06-20 14:07:33 +01:00
Dave Cranwell
135d4f20a6 Update frontenddevelopers.rst 2014-06-20 14:04:11 +01:00
Dave Cranwell
c1f2f745af Update frontenddevelopers.rst
heading level fix
2014-06-20 13:49:25 +01:00
Dave Cranwell
8cb94f0b5c Update frontenddevelopers.rst
Added notes about new image manipulation techniques
2014-06-20 13:46:43 +01:00
Dave Cranwell
f147581ca6 better css class concat 2014-06-20 12:58:18 +01:00
Tom Talbot
d68d764d91 Reorganise unit tests to obviate the use of del 2014-06-20 12:37:20 +01:00
Dave Cranwell
ca8d38b4ab refactored how classes are applied by edit handlers. replaced inconsistent name 'classes' on settings tab. misc tweaks to improve layout. Merged FieldRowPanel concept from davecranwell#327 2014-06-20 12:05:58 +01:00
Karl Hobley
a5834513c3 Implemented results caching on ElasticSearchResults 2014-06-20 11:51:38 +01:00
Karl Hobley
d4aa5d5090 Added __repr__ method to ElasticSearchResults 2014-06-20 11:43:33 +01:00
Karl Hobley
1475d440e3 len(ESResults) now runs query and gets the length of the results. Added ESResults.count() which asks Elasticsearch for the count but doesn't run the query 2014-06-20 11:42:17 +01:00
Karl Hobley
16b385da97 Slicing ESResults now returns a new ESResults object
Previously, slicing an ESResults object made it run a query against ElasticSearch and return the results
This commit changes this by making slice return a new ESResults object with start and stop limits applied. To get results, you now have to iterate the ESResults object.
2014-06-20 11:35:19 +01:00