Karl Hobley
|
1671b2cfa8
|
Merge branch 'pr/301'
Conflicts:
CHANGELOG.txt
|
2014-06-27 12:01:46 +01:00 |
|
Karl Hobley
|
a41292a37e
|
Merge branch 'pr/300'
|
2014-06-27 12:01:17 +01:00 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Nick Smith
|
dd7344d65d
|
Add tests for notification preferences views' being filtered for less privileged users
|
2014-06-23 13:17:58 +01:00 |
|