Commit graph

1319 commits

Author SHA1 Message Date
Dave Cranwell
e8dd039dce ongoing tweaks 2014-07-24 11:10:42 +01:00
Dave Cranwell
4157d49eaa tweaks 2014-07-18 10:23:05 +01:00
Dave Cranwell
439dd600f4 ongoing work to make new settings menu work 2014-07-18 10:20:03 +01:00
Dave Cranwell
588ae1a4b3 Merge remote-tracking branch 'upstream/master' 2014-07-17 13:02:16 +01:00
Dave Cranwell
0f87becf13 slight glyph metric improvement for users + sites 2014-07-17 13:01:50 +01:00
Dave Cranwell
773f891a09 updated wagtail font with unified user icon and site icon 2014-07-17 12:57:10 +01:00
Matt Westcott
ec47e00e21 Merge branch 'remove-embedly-filter' of https://github.com/kaedroho/wagtail into kaedroho-remove-embedly-filter
Conflicts:
	wagtail/wagtailembeds/tests.py
2014-07-17 12:33:13 +01:00
Matt Westcott
356168f37e Convert go_live_at / expire_at timestamps to the server's own timezone when submitting, so that tests don't need TIME_ZONE='UTC' 2014-07-16 17:21:31 +01:00
Karl Hobley
b0302d5e2d Fixes to documentation of Page attributes 2014-07-15 13:39:11 +01:00
Matt Westcott
d0c265f9b7 Merge pull request #470 from takeflight/feature/admin-hook-decorator
Return the function again from the hook decorator
2014-07-15 09:17:33 +01:00
Tim Heap
edd8ac2d77 Return the function again from the hook decorator
The decorator variant of hook registration did not return anything,
meaning that the decorated function would end up being `None`. This was
not noticed, as the functions are rarely called manually, as opposed to
being invoked via the hook.
2014-07-15 16:09:11 +10:00
Matt Westcott
493d45693f update wagtail_hooks across all wagtail subapps to use decorator syntax 2014-07-14 18:31:26 +01:00
Matt Westcott
27260ab8ad Merge branch 'feature/admin-hook-decorator' of https://github.com/takeflight/wagtail into takeflight-feature/admin-hook-decorator 2014-07-14 17:57:53 +01:00
Matt Westcott
68c5e1dff8 Merge branch 'stable/0.4.x'
Conflicts:
	docs/releases/index.rst
2014-07-14 13:14:53 +01:00
Karl Hobley
930833324d Fixed backwards compatibility with Elasticsearch URLs setting 2014-07-14 12:27:25 +01:00
Karl Hobley
67aa7f9406 Merge pull request #464 from kaedroho/makemessages
Rerun makemessages
2014-07-11 14:43:58 +01:00
Karl Hobley
5f83b4a423 Improvements to PageQuerySet docs 2014-07-11 14:25:14 +01:00
Karl Hobley
c05211d684 Improvements to PageQuerySet docs 2014-07-11 12:39:56 +01:00
Karl Hobley
4bfd0e5a20 Merge branch 'master' into autodoc
Conflicts:
	runtests.py
2014-07-11 12:23:25 +01:00
Karl Hobley
1ddf5651ba Run makemessages on wagtailstyleguide 2014-07-11 11:57:36 +01:00
Karl Hobley
a90bd0b0f1 Rerun makemessages on wagtailsnippets 2014-07-11 11:55:25 +01:00
Karl Hobley
e1754ebfa1 Rerun makemessages on wagtailsearch 2014-07-11 11:54:35 +01:00
Karl Hobley
acfcbe9aa3 Rerun makemessages on wagtailimages 2014-07-11 11:54:01 +01:00
Karl Hobley
6c3d1275cb Rerun makemessages on wagtailusers 2014-07-11 11:53:13 +01:00
Karl Hobley
8302cf2866 Rerun makemessages on wagtailredirects 2014-07-11 11:47:50 +01:00
Karl Hobley
3ceb816f45 Run makemessages on wagtailforms 2014-07-11 11:46:12 +01:00
Karl Hobley
88ea61ee38 Rerun makemessages on wagtailembeds 2014-07-11 11:45:35 +01:00
Karl Hobley
ba662ae9b1 Rerun makemessages on wagtaildocs 2014-07-11 11:43:25 +01:00
Karl Hobley
a4c7e90de9 Rerun makemessages on wagtailcore 2014-07-11 11:42:37 +01:00
Karl Hobley
40054a12f5 Rerun makemessages on wagtailadmin 2014-07-11 11:42:17 +01:00
Matt Westcott
9b8ee979d2 fix tests for lt, gte, lte filters to expect a multi_match response 2014-07-09 23:29:37 +01:00
Matt Westcott
3d161f1aa7 Merge branch 'searchchanges/bits-and-pieces-2' of https://github.com/kaedroho/wagtail into kaedroho-searchchanges/bits-and-pieces-2
Conflicts:
	wagtail/wagtailcore/models.py
	wagtail/wagtailcore/query.py
2014-07-09 23:28:55 +01:00
Karl Hobley
bc2556db28 Updated tests for 5766224 2014-07-09 17:16:20 +01:00
Robert Clark
5766224808 sitemap should return the full url 2014-07-09 17:13:48 +01:00
Matt Westcott
677d0333f4 suppress DeprecationWarnings thrown in tests by classes with old-style indexed_fields definitions 2014-07-09 16:26:54 +01:00
Matt Westcott
d4c4c08d7c add tests for lt, gte, lte lookups in TestElasticSearchQuery 2014-07-09 15:18:22 +01:00
Matt Westcott
f5107f7d44 Merge branch 'searchchanges/tests' of https://github.com/kaedroho/wagtail into kaedroho-searchchanges/tests 2014-07-09 15:13:52 +01:00
Tim Heap
59966b5385 Support registering admin hooks through decorators 2014-07-09 15:26:07 +10:00
Matt Westcott
95c7654216 Page.search should invoke backend.search with cls as a plain arg, not a 'model' kwarg 2014-07-08 20:25:54 +01:00
Matt Westcott
cbe76666e1 Merge branch 'searchchanges/searchonqueryset' of https://github.com/kaedroho/wagtail into kaedroho-searchchanges/searchonqueryset 2014-07-08 16:30:53 +01:00
Matt Westcott
5731155e4d Merge pull request #352 from kaedroho/searchchanges/partials
Search Changes 10 - Index partials together into '_partials'
2014-07-08 15:24:58 +01:00
Tom Dyson
b1021c6c2e Merge pull request #435 from kaedroho/search-frontend-urls-change
Allow search frontend urls to be imported from wagtailsearch.urls
2014-07-08 12:12:36 +01:00
Tom Dyson
e344b8a367 Merge pull request #425 from kaedroho/issue/222
Fixes and Tests for #339
2014-07-08 12:09:23 +01:00
Karl Hobley
a1e641215d Allow search frontend urls to be imported from wagtailsearch.urls
When editors picks is merged, I plan to move 'wagtailsearch.frontend.urls' to 'wagtailsearch.urls'

This commit adds forwards-compatibility for this change
2014-07-08 10:51:00 +01:00
Matt Westcott
bb8fe613e5 Merge pull request #432 from kaedroho/issue/431
Check that the user has permission to see the admin dashboard before redirecting them there. Fixes #431
2014-07-08 10:42:56 +01:00
Karl Hobley
895a898c0e privilaged => privileged 2014-07-08 10:21:53 +01:00
Karl Hobley
c0eeb81cd3 Merge pull request #426 from torchbox/feature/fep2
Front-end permissions
2014-07-08 10:00:00 +01:00
Karl Hobley
90bdd0c501 Check that the user has permission to see the admin dashboard before redirecting them there. Fixes #431 2014-07-08 09:49:18 +01:00
Karl Hobley
135f6e45d7 TestAuthentication tests are now logged out by default 2014-07-08 09:48:26 +01:00
Karl Hobley
92818ddbd6 Added failing test for #431 2014-07-08 09:40:36 +01:00