0
0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00
Commit Graph

1544 Commits

Author SHA1 Message Date
Matt Westcott
78481dc846 syntactic sugar for get_page_modes: change it to a property called preview_modes and add a default_preview_mode helper
Conflicts:
	wagtail/wagtailadmin/views/pages.py
2014-07-03 15:01:35 +01:00
Matt Westcott
dd52ccab2a Remove X-Requested-With header hacks on the incoming requests to preview_on_edit and preview_on_create - no longer necessary, because we're not passing that request to the preview logic
Conflicts:
	wagtail/wagtailadmin/views/pages.py
2014-07-03 14:59:34 +01:00
Karl Hobley
3dc83a961f Updated changelog 2014-07-03 13:07:18 +01:00
Karl Hobley
25e9249308 Added a couple of missing python version classifiers 2014-07-03 13:06:32 +01:00
Karl Hobley
00347ff6ba Rearrange static site generation docs 2014-07-03 12:53:11 +01:00
Matt Westcott
f28e43f02f Merge branch 'master' of github.com:torchbox/wagtail 2014-07-03 12:36:15 +01:00
Matt Westcott
e509871624 Merge branch 'kaedroho-page-duplication' 2014-07-03 12:35:57 +01:00
Matt Westcott
27e935db68 Merge branch 'page-duplication' of https://github.com/kaedroho/wagtail into kaedroho-page-duplication
Conflicts:
	wagtail/wagtailcore/tests/test_page_model.py
2014-07-03 12:35:43 +01:00
Neal Todd
2f126bda6e Update index.rst 2014-07-03 12:26:48 +01:00
Matt Westcott
45621aa48e Merge branch 'kaedroho-python3-take2-unicode-literals' 2014-07-03 12:15:50 +01:00
Matt Westcott
9938ecf960 add py32-dj16-sqlite to the list of tox environments that fail due to iteritems in South 2014-07-03 12:11:34 +01:00
Matt Westcott
d4cfb434d5 Merge branch 'python3-take2-unicode-literals' of https://github.com/kaedroho/wagtail into kaedroho-python3-take2-unicode-literals 2014-07-03 11:51:03 +01:00
Dave Cranwell
b0ef94a2db Update README.rst 2014-07-03 11:06:43 +01:00
Dave Cranwell
3ab75c0cfe Update README.rst 2014-07-03 11:05:56 +01:00
Karl Hobley
1a3558cabd Added DeprecationWarning to wagtailadmin.hooks 2014-07-03 10:25:26 +01:00
Karl Hobley
6868d30ded Merge pull request #411 from gasman/move_hooks_into_wagtailcore
Move the hooks subsystem into wagtailcore
2014-07-03 10:23:18 +01:00
Karl Hobley
d71342ce44 Merge pull request #415 from davecranwell/master
Addressing issue where ordering of new inlinepanel items created two ite...
2014-07-03 10:19:26 +01:00
Dave Cranwell
09cdc99ff2 Addressing issue where ordering of new inlinepanel items created two items of the same order 2014-07-03 10:14:01 +01:00
Karl Hobley
6800869153 Ditto for WagtailAdminModelForm class 2014-07-02 22:37:08 +01:00
Karl Hobley
c743b71a03 Cast edit handler type names to str before passing into type()
On python 2, these need to be bytestrings and on python 3 they need to be unicode. So casting to str is a good fit.
2014-07-02 22:26:30 +01:00
Karl Hobley
81f427d801 Make sure names of edit handler types are bytestrings and not unicode 2014-07-02 22:15:48 +01:00
Karl Hobley
f758808a21 Added python 3.2 to travis settings 2014-07-02 22:02:07 +01:00
Matt Westcott
b45b1d5404 remove a load of unused imports 2014-07-02 21:56:50 +01:00
Karl Hobley
e42029328f Added python 3.2 support to readme 2014-07-02 21:46:37 +01:00
Karl Hobley
9755ece5cc Added python 3.2 to tox settings 2014-07-02 21:45:38 +01:00
Karl Hobley
76b720721a Removed unicode literals for Python 3.2 support 2014-07-02 21:43:15 +01:00
Matt Westcott
79de8bf884 replace assertRegexpMatches with six.assertRegex to prevent deprecation warnings on python 3 2014-07-02 21:19:29 +01:00
Matt Westcott
352c7ce8f5 replace assertEquals with assertEqual to prevent deprecation warnings on python 3 2014-07-02 21:05:16 +01:00
Matt Westcott
dea5124103 suppress warnings from wagtailembeds tests 2014-07-02 21:02:42 +01:00
Matt Westcott
92dc6add90 update hook examples in docs to import from wagtailcore, not wagtailadmin 2014-07-02 20:04:06 +01:00
Matt Westcott
618dd96a88 update wagtailstyleguide and wagtailcore.rich_text to import hooks from wagtailcore rather than wagtailadmin 2014-07-02 20:02:25 +01:00
Matt Westcott
7a80c8adca Move the 'hooks' module from wagtailadmin to wagtailcore
Conflicts:
	wagtail/tests/wagtail_hooks.py
	wagtail/wagtailadmin/views/pages.py
2014-07-02 19:59:00 +01:00
Tom Dyson
47c83e75b1 Lets -> Let's 2014-07-02 17:57:30 +01:00
Neal Todd
41ff751009 Update index.rst 2014-07-02 17:57:15 +01:00
Karl Hobley
83b133fe17 Merge remote-tracking branch 'torchbox/master' 2014-07-02 17:52:24 +01:00
Karl Hobley
a6637ffc18 Added some missing changelog entries 2014-07-02 17:51:36 +01:00
Tom Dyson
0d5cabd1e7 Two new features in README 2014-07-02 17:50:03 +01:00
Neal Todd
80ea75d244 Bump flake8 to correct latest version. 2014-07-02 17:47:03 +01:00
Karl Hobley
0575a90f54 Merge pull request #364 from kaedroho/varnish-cache-invalidation
Frontend cache invalidation
2014-07-02 17:44:03 +01:00
Karl Hobley
35fd9f4a98 Merge branch 'master' into varnish-cache-invalidation
Conflicts:
	wagtail/wagtailcore/models.py
2014-07-02 17:43:47 +01:00
Neal Todd
c271db4601 Merge pull request #409 from nealtodd/deps-update
Requirements version updates, documenting dependencies via requirements.io and updating supported python version docs.
2014-07-02 17:43:36 +01:00
Karl Hobley
448b50a011 Merge pull request #325 from kaedroho/sitemaps
Sitemap generator
2014-07-02 17:42:13 +01:00
Neal Todd
e31ff7f3c4 Requirements version updates, documenting dependencies via requirements.io and updating supported python version docs. 2014-07-02 17:31:06 +01:00
Karl Hobley
62c59744f9 Merge branch 'master' into varnish-cache-invalidation
Conflicts:
	setup.py
2014-07-02 17:22:19 +01:00
Karl Hobley
ab518b6472 Merge branch 'master' into sitemaps 2014-07-02 17:21:20 +01:00
Matt Westcott
4f92311b37 Merge branch 'kaedroho-python3-take2' 2014-07-02 17:18:15 +01:00
Matt Westcott
442286463f update setup.py with classifiers for Python3.3 and Python3.4 2014-07-02 17:17:25 +01:00
Matt Westcott
ab486a526a update travis config to not accept failures on 3.4 2014-07-02 17:16:19 +01:00
Matt Westcott
38ca434aeb add tox tests for postgres on python3.3 and python3.4 2014-07-02 17:14:34 +01:00
Matt Westcott
66fb8bb2d1 Merge branch 'python3-take2' of https://github.com/kaedroho/wagtail into kaedroho-python3-take2 2014-07-02 15:19:52 +01:00