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
Karl Hobley
948c11bbd2
Added max_filesize to all image uploader views
2014-10-26 11:50:14 +00:00
Karl Hobley
b7b5e182fa
Added image filesize validation
2014-10-26 11:50:14 +00:00
Karl Hobley
7cf31a4386
Merge pull request #751 from kaedroho/images-tests-reorg-2
...
Reorganised images tests
2014-10-26 11:49:15 +00:00
Karl Hobley
9165351343
Reorganised images tests
2014-10-26 11:37:00 +00:00
John-Scott Atlakson
e32827f143
Merge branch 'master' into custom-user-model-fixes
...
Conflicts:
wagtail/wagtailadmin/forms.py
2014-10-24 13:59:47 -04:00
Matt Westcott
793ebd4cc2
Release note for #743
2014-10-24 16:42:38 +01:00
Matt Westcott
24ca59465e
Merge pull request #743 from kaedroho/template-dependency-fix
...
Project template: Fixed migration dependency
2014-10-24 16:29:08 +01:00
Matt Westcott
b57fab3cca
Merge pull request #720 from kaedroho/use-lastest_revision_created_at-in-sitemap-generator
...
Use latest_revision_created_at in sitemap generator
2014-10-24 15:33:40 +01:00
Matt Westcott
92d0dd9895
Release note for #748
2014-10-24 10:58:54 +01:00
Matt Westcott
23393eaf90
Merge pull request #748 from kaedroho/fix-revisions-copying-on-child-pages
...
Fix revisions still copying for child pages
2014-10-24 10:53:53 +01:00
Matt Westcott
e7be80af50
release note for #732
2014-10-24 10:52:03 +01:00
Matt Westcott
548b10a82a
Merge pull request #732 from kaedroho/copy-revisions-created-at-bug
...
Don't overwrite created_at of copied page revisions
2014-10-24 10:42:48 +01:00
Karl Hobley
3503981802
Fix revisions still copying for child pages
...
When Page.copy runs recursively, it forgot to pass through the
copy_revisions value that the user specified causing revisions to always
be copied for subpages regardless of what the user wanted
2014-10-24 10:32:20 +01:00
Karl Hobley
13e8e73830
Project template: Fixed migration dependency
...
The project template currently crashes on first migrate because it tries
to run the create homepage migration before the Page.locked field is
created.
This commit fixes (and hopefully, future proofs) this by telling Django
that the core app migrations depend on the latest wagtailcore migration,
which should make Django fully migrate wagtailcore before starting the
core app.
2014-10-23 20:06:26 +01:00
Matt Westcott
1871a29f30
release note for #569
2014-10-23 17:31:54 +01:00
Matt Westcott
04f93e2bbf
Merge branch 'kaedroho-logging'
2014-10-23 17:18:45 +01:00
Matt Westcott
1d54ebaabf
Merge branch 'logging' of https://github.com/kaedroho/wagtail into kaedroho-logging
2014-10-23 17:10:36 +01:00
Matt Westcott
3f95387ba9
Merge branch 'nimasmi-login_page_tabindex'
2014-10-23 16:09:43 +01:00
Matt Westcott
9b3048a141
Merge branch 'login_page_tabindex' of https://github.com/nimasmi/wagtail into nimasmi-login_page_tabindex
2014-10-23 16:08:13 +01:00
Karl Hobley
3de6cb5ff4
Use new_url_path in page move log
2014-10-23 16:08:08 +01:00
Matt Westcott
f8f3fbd17e
Merge branch 'logging' of https://github.com/kaedroho/wagtail into kaedroho-logging
2014-10-23 15:14:51 +01:00