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

2553 commits

This branch
This branch
All branches
Author SHA1 Message Date
Karl Hobley
34f2a90343 Changelog for #369 2014-06-25 15:35:19 +01:00
Karl Hobley
a5715e2ef1 Changelog for #374 2014-06-25 15:33:22 +01:00
Karl Hobley
1ba8bd1e11 Merge pull request #374 from davecranwell/fix/373 
fixes issue #373
 2014-06-25 15:30:46 +01:00
Dave Cranwell
02d8cc01e3 fixes issue #373 2014-06-25 15:28:22 +01:00
Matt Westcott
b3fd5044c0 Merge pull request #370 from kaedroho/search-fix 
Move normalise_query_string into wagtailsearch.utils and use it in the backends
 2014-06-25 11:50:29 +01:00
Karl Hobley
77c7152617 Move normalise_query_string into wagtailsearch utils and use it in the backends 2014-06-25 11:27:16 +01:00
Tom Talbot
e2f8debcff Merge branch 'master' into even-more-unit-tests 2014-06-25 11:15:40 +01:00
Tom Talbot
015de477af Add unit tests for embed filters 2014-06-25 11:13:09 +01:00
Karl Hobley
5dea34f234 Merge pull request #369 from kaedroho/embeds-fix-2 
Embeds: Fixed crash when no HTML field is sent back from the embed provider
 2014-06-25 11:04:56 +01:00
Karl Hobley
70211c5650 Embeds: Fixed crash when no HTML field is sent back from the embed provider 2014-06-25 10:51:40 +01:00
Dave Cranwell
0696ac8832 Update CONTRIBUTORS.rst 2014-06-25 10:21:38 +01:00
Tim Heap
8cc4bdf39e Link to the root page, not the site root 2014-06-25 08:47:48 +10:00
Karl Hobley
7d0e03a08c Merge pull request #365 from mope/80-fix-editors-picks-search 
Fix #80
 2014-06-24 16:41:24 +01:00
Tom Talbot
1f645a7ba0 Fix #80 
Searching for a non-existent editor's pick now displays the correct not
found message.
 2014-06-24 15:38:13 +01:00
Tom Talbot
07762aa7bd Merge branch 'master' into rich-text-unit-tests 2014-06-24 14:57:07 +01:00
Tom Talbot
ea14d99d18 Alter comment formatting in wagtailcore tests.py 2014-06-24 14:56:40 +01:00
Tom Talbot
f9520d65ad Merge branch 'master' into fix-edit-handlers-test 
Conflicts:
	wagtail/wagtailadmin/tests/test_edit_handlers.py
 2014-06-24 14:41:48 +01:00
Tom Talbot
085324c1b6 Update snippets tests 
Add an Advert fixture so that Advert objects do not need to be created
by the tests that use them.
 2014-06-24 14:30:23 +01:00
Karl Hobley
b41a6d730f Revert "Merge pull request #335 from mope/edit-handlers-unit-tests" 
This reverts commit 7ad6be82f3, reversing
changes made to 4c77a4b18a.
 2014-06-24 12:53:34 +01:00
Tom Talbot
183c73c78a Fix test_edit_handlers breaking other tests 2014-06-24 11:50:44 +01:00
Karl Hobley
7ad6be82f3 Merge pull request #335 from mope/edit-handlers-unit-tests 
Add unit tests for edit_handlers.py. Lint edit_handlers.py.
 2014-06-24 10:43:54 +01:00
Tom Talbot
874c364edc Merge branch 'master' into rich-text-unit-tests 2014-06-24 10:29:33 +01:00
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