Commit graph

2918 commits

Author SHA1 Message Date
Karl Hobley
8441eac8dd Fixed reference to ALLOWED_EXTENSIONS_TEXT 2014-10-29 11:04:33 +00:00
Matt Westcott
7bfb1bb544 Merge branch 'kaedroho-search/search-fields-overriding' 2014-10-28 21:15:30 +00:00
Matt Westcott
ad89e8f54d release note for #715 2014-10-28 21:15:18 +00:00
Matt Westcott
b140fd88d9 Prevent search signal handlers from breaking fixture loading on Django 1.7 2014-10-28 20:43:22 +00:00
Matt Westcott
63834a3c57 add clarifying comment about how test_overriding relates to model inheritance 2014-10-28 17:33:42 +00:00
Matt Westcott
b151a0b9b0 Merge branch 'search/search-fields-overriding' of https://github.com/kaedroho/wagtail into kaedroho-search/search-fields-overriding 2014-10-28 17:29:24 +00:00
Matt Westcott
59fb5c9222 fix spelling 2014-10-28 16:38:23 +00:00
Matt Westcott
4c392b9b00 Merge branch 'kaedroho-search/index-correct-object' 2014-10-28 16:37:16 +00:00
Matt Westcott
bdd31f1141 Merge branch 'search/index-correct-object' of https://github.com/kaedroho/wagtail into kaedroho-search/index-correct-object 2014-10-28 16:35:30 +00:00
Karl Hobley
ddbe634eda Release note for #705 2014-10-28 16:28:57 +00:00
Karl Hobley
674f55170e Changelog for #705 2014-10-28 16:28:12 +00:00
Karl Hobley
af0fdc35e7 Changelog for #705 2014-10-28 16:26:43 +00:00
Karl Hobley
9b01f9e2d7 Merge pull request #705 from jsma/custom-user-model-fixes
Fixed login form to reference USERNAME_FIELD
2014-10-28 16:25:58 +00:00
Karl Hobley
86cc69baaf Added get_indexed_instance method
When a signal handler is run on a model that is the parent in a multi
table inheritance relationship, we do not have access to all of the
fields we need to properly reindex the object.

This commit adds a method that the developer can use to specify how to
get the specific type of a particular instance which we can use to
reindex it.
2014-10-28 16:10:49 +00:00
Matt Westcott
51e650c739 Merge branch 'kaedroho-use-specific-page-class-in-admin' 2014-10-28 16:09:06 +00:00
Matt Westcott
1e1656440a Merge branch 'use-specific-page-class-in-admin' of https://github.com/kaedroho/wagtail into kaedroho-use-specific-page-class-in-admin 2014-10-28 16:08:48 +00:00
Matt Westcott
2559f75255 Merge branch 'kaedroho-search/deduplication-2' 2014-10-28 16:08:19 +00:00
Matt Westcott
47e32a3cd1 Release note for #714 2014-10-28 16:07:59 +00:00
Matt Westcott
80c0822066 Merge branch 'search/deduplication' of https://github.com/kaedroho/wagtail into kaedroho-search/deduplication-2 2014-10-28 15:49:42 +00:00
Karl Hobley
3c3c3b6557 Improved performance of signal handlers 2014-10-28 15:39:57 +00:00
Matt Westcott
ceb7139b71 Merge branch 'master' of github.com:torchbox/wagtail 2014-10-28 14:54:03 +00:00
Matt Westcott
84c9810e25 add Django 1.7 migration for #718 2014-10-28 14:53:57 +00:00
John-Scott Atlakson
4300b62762 Added back 'your' 2014-10-28 09:42:27 -04:00
Matt Westcott
e2b4866ab7 Merge pull request #747 from kaedroho/issue-746
Add keep_live flag to Page.copy
2014-10-28 13:06:22 +00:00
Matt Westcott
5cb428608b pin libsass to version 0.5.1 in tox.ini, since the current Travis VM can't install 0.6 - see #760 2014-10-28 10:51:57 +00:00
Karl Hobley
d8f33d0729 Added keep_live flag to Page.copy 2014-10-28 09:54:40 +00:00
Matt Westcott
5405c2b4f8 Merge branch 'kaedroho-clear-site-root-paths-on-delete' 2014-10-27 17:44:39 +00:00
Matt Westcott
c440087c3e release note for #719 2014-10-27 17:44:28 +00:00
Matt Westcott
5e06a4485a fix inaccurate comments and duplicate definition of test_cache_clears_when_site_deleted 2014-10-27 17:43:23 +00:00
Matt Westcott
10aec3a943 Merge branch 'clear-site-root-paths-on-delete' of https://github.com/kaedroho/wagtail into kaedroho-clear-site-root-paths-on-delete 2014-10-27 17:37:28 +00:00
Matt Westcott
71babb726c Merge branch 'kaedroho-foreign-key-system-check' 2014-10-27 17:15:18 +00:00
Matt Westcott
f408dddfbe Release note for #718 2014-10-27 17:15:06 +00:00
Matt Westcott
3b9d1efa92 Merge branch 'foreign-key-system-check' of https://github.com/kaedroho/wagtail into kaedroho-foreign-key-system-check 2014-10-27 16:58:34 +00:00
Matt Westcott
55e5d711c5 Merge pull request #754 from kaedroho/template-delete-readme
Template: Deleted readme
2014-10-27 09:41:19 +00:00
Karl Hobley
ef7a8c9866 Template: Deleted readme
Not needed
2014-10-27 09:19:44 +00:00
John-Scott Atlakson
fdea93629d Merge branch 'master' into custom-user-model-fixes 2014-10-26 19:39:15 -04:00
Karl Hobley
c76bc9c30e Clear wagtail_site_root_paths on Site delete
Fixes #706
2014-10-26 18:19:08 +00:00
Karl Hobley
ff4b42c38b Fixed allowed extensions in multiple image uploader 2014-10-26 11:50:15 +00:00
Karl Hobley
451abb9cc9 Clarity/translatablity improvements. Fixed test 2014-10-26 11:50:15 +00:00
Dave Cranwell
66c92f0333 unifying of messages and added to uploader 2014-10-26 11:50:15 +00:00
Karl Hobley
82657344de Added separate error when image format is known 2014-10-26 11:50:15 +00:00
Karl Hobley
71c48e01ed WagtailImageField help text. Some refactoring 2014-10-26 11:50:15 +00:00
Dave Cranwell
140855c03c less poluting method of variable scoping 2014-10-26 11:50:15 +00:00
Dave Cranwell
9b47343e2a updates to how error message and accepted file type/size are mentioned by jquery upload plugin 2014-10-26 11:50:14 +00:00
Dave Cranwell
57c4253b94 started adding pre-upload validation to images 2014-10-26 11:50:14 +00:00
Dave Cranwell
c0c6a1bd7c started adding pre-upload validation to images 2014-10-26 11:50:14 +00:00
Karl Hobley
4a6a09ec13 Check image file size before the format
Checking the file format may take a long time if the uploaded file is
very big so it makes sense to check the file size first to prevent the
server being held up unneccessarily.
2014-10-26 11:50:14 +00:00
Karl Hobley
ffec059c12 Refactored image validation into a custom field
This fixes issues with Django closing the image file before running
validators.
This may give a slight improvement in upload speed as the file doesn't
keep having to be reopened.
This unifies our image validation with Django's image validation so
error messages could be shared (not implemented yet though).
The code is more maintainable (the validators no longer need to be
called manually from the multiple image uploader for example)
2014-10-26 11:50:14 +00:00
Dave Cranwell
50f8aed9c3 tweak to validator message. passing through max size vars 2014-10-26 11:50:14 +00:00
Karl Hobley
5999e96505 Fixed display of hidden fields on image add view
Same as #668 but for the old image add view
2014-10-26 11:50:14 +00:00