0
0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-30 01:46:24 +01:00
Commit Graph

5169 Commits

Author SHA1 Message Date
Matt Westcott
f502e31dd7 Merge branch 'master' of https://github.com/m-sanders/wagtail into m-sanders-master
Conflicts:
	wagtail/wagtailusers/templates/wagtailusers/groups/create.html
	wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
2015-10-06 16:41:00 +01:00
Karl Hobley
490ecff007 Changelog for #1709 2015-10-06 11:06:44 +01:00
Matt Westcott
9e28bee22b Set HTTP_HOST in dummy_request for preview - fixes #1703 2015-10-06 11:02:45 +01:00
Karl Hobley
403d76fdfd Merge pull request #1668 from gasman/fix/chooser-not-hiddenfields
Chooser widgets should appear in the visible_fields list, not hidden_fields
2015-10-06 10:58:51 +01:00
Tim Heap
5c3908968c Raise ValueError from resolve_model_string for unknown types
A `LookupError` is raised by `apps.get_model()` for an unknown model,
but this `LookupError` was also being raised when values with unhandled
types were passed in. This should be a `ValueError` instead. The
docstring has been amended to document the errors raised.
2015-10-06 13:34:18 +11:00
Matt Westcott
ed8399caee Merge branch 'davecranwell-longrunning-forms' 2015-10-05 22:55:18 +01:00
Matt Westcott
cf9758138a Release note for #1075 2015-10-05 22:54:37 +01:00
Matt Westcott
498db70e5d Merge branch 'longrunning-forms' of https://github.com/davecranwell/wagtail into davecranwell-longrunning-forms
Conflicts:
	wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/forms.scss
2015-10-05 22:48:27 +01:00
Matt Westcott
3cbee6c66c fix typo I introduced while removing typos 2015-10-05 21:12:21 +01:00
Matt Westcott
7d67e4b448 Minor copyediting on the Pages docs 2015-10-05 21:07:09 +01:00
Karl Hobley
be0a2ccd1c Tweaks to template rendering docs 2015-10-05 21:07:09 +01:00
Karl Hobley
f72e84f199 Added a couple of missing links 2015-10-05 21:07:09 +01:00
Karl Hobley
c18c67ba3b Working with pages docs 2015-10-05 21:07:09 +01:00
Karl Hobley
2e65c08210 Docs for inline models 2015-10-05 21:07:09 +01:00
Karl Hobley
ee7718ccdb Various tweaks 2015-10-05 21:07:09 +01:00
Karl Hobley
249a411b09 Template rendering docs 2015-10-05 21:07:09 +01:00
Karl Hobley
1b282d49bc Work on "Page models" 2015-10-05 21:07:09 +01:00
Karl Hobley
86c01bdf7b Renamed to "Page models"
I think this is a good place to add some general usage docs so made the name more generic.
2015-10-05 21:07:09 +01:00
Karl Hobley
e1bb391625 editing_api => panels 2015-10-05 21:07:08 +01:00
Karl Hobley
85414a8b54 Fixed headings 2015-10-05 21:07:08 +01:00
Karl Hobley
f72b8302f9 Moved "setting up the page editor interface" into topics 2015-10-05 21:07:08 +01:00
Matt Westcott
deee02e4d7 Release note for #1391 2015-10-05 18:41:48 +01:00
Matt Westcott
a86b08a622 Add favicon as an overrideable branding block - fixes #1391 2015-10-05 18:20:08 +01:00
Karl Hobley
00a1402925 Changelog/release notes for #1783 and #1784 2015-10-05 17:03:25 +01:00
Josh Barr
7c5b28bfe0 Added revision to page_published signal. Fixes #1765 2015-10-05 16:59:54 +01:00
Tim Heap
bc6b5a8a6c Normalise all code blocks in the docs
All `.. code::` instances have been changed to use `.. code-block::`,
and have been properly formatted. The syntax names have been normalised,
so all django templates use the `html+django` syntax, shell commands use
`sh`, and plain text uses `text`.
2015-10-05 16:55:58 +01:00
Tim Heap
d97d1f4b8e Use isinstance check to detect strings
Using `isinstance(filter, string_types)` will detect strings much more
reliably than `not hasattr(filter, 'run')`.
2015-10-05 16:55:38 +01:00
Tim Heap
d31e4cd032 Remove all ObjectDoesNotExist uses 2015-10-05 16:54:58 +01:00
Josh Barr
9c1ce6037d modified homepage template to remove variable 2015-10-05 23:46:11 +13:00
Tom Dyson
952a461e4c Merge pull request #1780 from JoshBarr/docs/template-tags-tutorial
Added clarification about template tags to tutorial
2015-10-05 10:24:06 +01:00
Josh Barr
53773424ff added clarification about template tags to tutorial 2015-10-05 22:01:03 +13:00
Tom Dyson
a43d91957d Merge pull request #1779 from takeflight/refactor/document-get-extension
Use os.path.splitext() instead of custom logic in Document.file_extension
2015-10-05 09:43:19 +01:00
Tim Heap
439e4b9a3d Add tests for rendered StreamField output 2015-10-05 14:08:37 +11:00
Tim Heap
86f6287202 Use os.path.splitext() instead of custom logic 2015-10-05 13:26:46 +11:00
Karl Hobley
8bf9851e01 Added docstring on Embed model 2015-10-04 16:27:17 +01:00
Matt Westcott
2534ee6d2d Merge pull request #1773 from torchbox/revert-1768-feature/improve_exception_handling
Revert "Use model specific "DoesNotExist" exception "
2015-10-04 11:48:45 +01:00
Matt Westcott
bfe8cb1ac7 Revert "Use model specific "DoesNotExist" exception " 2015-10-04 11:48:02 +01:00
Ryan Pineo
8a3304c147 Fix page edit publish "View Live" url 2015-10-03 10:27:59 -04:00
Karl Hobley
7dd5467a7c Merge pull request #1766 from annp89/feature/remove_extra_if_statement
Remove redundant if statement
2015-10-03 09:53:32 +01:00
Karl Hobley
6afc3a9ead Merge pull request #1768 from annp89/feature/improve_exception_handling
Use model specific "DoesNotExist" exception
2015-10-03 09:53:11 +01:00
Karl Hobley
e9af76b263 Merge pull request #1769 from annp89/feature/built_in_fn_as_variable_name
Remove use of built in function 'format' as variable name
2015-10-03 09:52:23 +01:00
Ann Paul
1b7a3f045b Refactor try-catch block by limiting code in the try block
Always good to know which line will raise an exception and limit the try block to that statement
2015-10-02 23:17:49 -07:00
Ann Paul
1a51609701 Dont use built-in "format" as variable name since it shadows built-in name 2015-10-02 23:15:13 -07:00
Ann Paul
3b8111f224 Use model specific "DoesNotExist" exception than generic "ObjectDoesNotExist" exception 2015-10-02 22:49:24 -07:00
Ann Paul
17d97c17a1 Remove redundant if statement and refactor checking condition 2015-10-02 09:27:39 -07:00
Tim Heap
f6fb743a18 Add __html__ method to StreamValues
This allows template authors to write `{{ page.stream_field }}` in
Jinja2 templates without having to jump through HTML escaping loops.
2015-10-02 08:27:24 +10:00
Tim Heap
21d290af12 Add references to Django documentation on configuring Jinja 2015-10-02 08:06:28 +10:00
Karl Hobley
e955f7da4c Merge pull request #1761 from kaedroho/fix-search-suggestions
Fix search suggestions
2015-10-01 17:23:02 +01:00
Karl Hobley
99289a2849 Fix search suggestions 2015-10-01 12:45:25 +01:00
Tim Heap
cf7aaae09c Add tests for Jinja template tags 2015-10-01 20:04:06 +10:00