Commit graph

2631 commits

Author SHA1 Message Date
Karl Hobley
2d238bb989 Merge remote-tracking branch 'torchbox/master' into feature/multi-image-upload 2014-07-16 09:26:43 +01:00
Karl Hobley
c1cad0de6f Added tests for multiple image uploader 2014-07-15 17:46:23 +01:00
Karl Hobley
0cfc4ae94b Pass image_id into confirmation.json (as it was before)
This is because when the image is deleted, the ID gets unassigned. So "None" gets inserted into the response JSON.
2014-07-15 17:45:32 +01:00
Karl Hobley
98db7956f2 Some cleanup of images/multiple views 2014-07-15 17:35:19 +01:00
Karl Hobley
f96529ece9 Send back form on validation error of multi image uploader
This allows validations errors to be displayed on the frontend
2014-07-15 17:00:59 +01:00
Karl Hobley
0fe9d74efc Pass image object instead of image id into confirmation.json 2014-07-15 16:58:22 +01:00
Karl Hobley
062f027bc3 Use request.method == 'POST' to check if the request is a post request 2014-07-15 16:38:18 +01:00
Karl Hobley
7f21efd55d Added error message if user attempts to POST to multiple/add view without AJAX 2014-07-15 16:28:36 +01:00
Karl Hobley
4019a6be0a Removed a couple of unneeded lines 2014-07-15 16:24:53 +01:00
Karl Hobley
26e42e5529 ImageModel => Image 2014-07-15 16:05:02 +01:00
Karl Hobley
1da6824e67 Cleaned up unused imports 2014-07-15 16:05:02 +01:00
Karl Hobley
969f3de2b7 Added missing import 2014-07-15 16:05:02 +01:00
Karl Hobley
bd9d18a0d7 Use render() shortcut in images/multiple views 2014-07-15 16:05:02 +01:00
Karl Hobley
6d3bb2240d PEP8 fixes 2014-07-15 16:04:58 +01:00
Karl Hobley
f224e1ca2d Updated docs to use the new wagtail-project command 2014-07-15 15:31:41 +01:00
Karl Hobley
aee2869d5a Make wagtail-project command use the project template
Also did some cleanup
2014-07-15 14:38:08 +01:00
Karl Hobley
de94bc277d Imported wagtail-template 2014-07-15 14:26:28 +01:00
Helen Warren
e777b24baa Add wagtail-project command to wagtail set up which when executed creates a wagtail project based on the wagtail 'template' 2014-07-15 14:25:39 +01:00
Karl Hobley
227765359b Lots of small tweaks to docs 2014-07-15 14:16:46 +01:00
Karl Hobley
0b8fab6f42 Retitled routable_page doc, added to index 2014-07-15 13:48:05 +01:00
Karl Hobley
7f66d1a46d Improvements to subpage_urls docs 2014-07-15 13:45:42 +01:00
Karl Hobley
b0302d5e2d Fixes to documentation of Page attributes 2014-07-15 13:39:11 +01:00
Karl Hobley
8a0c473997 Added tests for page_unpublished signal 2014-07-15 13:23:00 +01:00
Karl Hobley
8c178511de Make sure page_unpublished.instance is always the most specific version of the page 2014-07-15 13:22:37 +01:00
Karl Hobley
6603c63b95 Use SQLite3 database backend when building docs
This prevents Django from loading psycopg2 when running autodocs on models files
2014-07-15 13:05:24 +01:00
Karl Hobley
f2cdd8eb42 Use page_unpublished signal in frontend cache invalidator 2014-07-15 12:45:29 +01:00
Karl Hobley
a5141d62c1 Fire page_unpublished signal on page unpublish and delete 2014-07-15 12:44:23 +01:00
Karl Hobley
4320b43ede Added page_unpublished signal 2014-07-15 12:44:00 +01:00
Karl Hobley
d1d8b7811a Added requirements file for docs 2014-07-15 12:39:42 +01:00
Karl Hobley
f8a24ae255 Tweaks to multilingual tutorial 2014-07-15 10:49:12 +01:00
Karl Hobley
a4c847c35d Typo fixes 2014-07-15 10:43:40 +01:00
Karl Hobley
dccb47178b Added tutorial for creating multilingual sites 2014-07-15 10:38:50 +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
Neal Todd
da996c6f06 Typo fix (led to incorrect file beig created). 2014-07-15 09:10:29 +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
d8fad0c207 Merge branch 'takeflight-feature/admin-hook-decorator' 2014-07-14 18:31:39 +01: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
f91cc8d7d5 update docs to use decorator syntax for hooks 2014-07-14 18:25:14 +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
Karl Hobley
a855749f5e Started RoutablePage docs 2014-07-14 15:09:22 +01:00
Karl Hobley
911ba9ec06 Fixed broken test
Caused by adding view into RouteResult
2014-07-14 14:08:09 +01:00
Karl Hobley
023579dc6b Added RoutablePage 2014-07-14 13:37:27 +01:00
Matt Westcott
68c5e1dff8 Merge branch 'stable/0.4.x'
Conflicts:
	docs/releases/index.rst
2014-07-14 13:14:53 +01:00
Matt Westcott
0d5f0172eb add release notes / changelog entry for 0.4.1 2014-07-14 13:12:04 +01:00
Karl Hobley
bbbc83c56e Allow RouteResult to return a view 2014-07-14 12:47:24 +01:00
Karl Hobley
cc446f0e97 FORCE_NEW is not used in Elasticsearch-py 2014-07-14 12:27:33 +01:00
Karl Hobley
930833324d Fixed backwards compatibility with Elasticsearch URLs setting 2014-07-14 12:27:25 +01:00
Tom Talbot
2fde7c6310 Fix Python 3 test failure 2014-07-14 11:44:01 +01:00
Tom Dyson
494a26b731 consistent editors / editor's / Editor's 2014-07-14 11:31:27 +01:00
Matt Westcott
51c6f251e2 Made contents a bit smaller 2014-07-14 11:30:54 +01:00