Commit graph

5315 commits

Author SHA1 Message Date
Matt Westcott
bd6a7c768f Use the live database record as the result of get_latest_revision_as_page if there are no draft edits.
This ensures that the live database state will be reflected in the page editor, which provides two benefits:
* any changes made directly at the model / database level (e.g. automated data imports) will be visible in the editor
* inline child objects will be associated with their actual database IDs even if this information is missing from the revision record. This ensures that their IDs will be preserved on next publish, rather than the records being deleted and recreated (#1853)
2015-10-29 17:16:07 +00:00
Karl Hobley
26857f525d Fix DeprecationWarning
``django.utils.importlib`` will be removed in Django 1.9. This causes a ``DeprecationWarning`` to be raised for Django 1.8 users.
2015-10-29 15:05:36 +00:00
Karl Hobley
f4706b8208 Ignore ResourceWarnings
This switches Python back to it's default behaviour. Elasticsearch creates a lot of noise with this warning switched on, hiding warnings that may be important.
2015-10-29 10:21:56 +00:00
Matt Westcott
0e7b92971a Release note for #1718 2015-10-29 00:12:02 +00:00
Matt Westcott
b14d366c9b Merge pull request #1718 from gasman/feature/image-library-system-check
Add system check for presence of libjpeg / zlib
2015-10-29 00:07:54 +00:00
Karl Hobley
a997cefa1a Merge pull request #1873 from gasman/fix/migrate-from-08
Make migrations depend on non-squashed versions
2015-10-28 09:22:40 +00:00
Matt Westcott
d76471e77c Make migrations depend on non-squashed versions - fixes #1817 2015-10-27 22:36:58 +00:00
Karl Hobley
1cefa305ae Use Travis pip cache 2015-10-27 17:19:32 +00:00
Matt Westcott
c813cf1e08 Merge branch 'alexgleason-admin-gui-fixes' 2015-10-27 11:51:20 +00:00
Matt Westcott
6dd69acd86 Release note for #1746 2015-10-27 11:51:07 +00:00
Alex Gleason
06984938bd Added code comment 2015-10-27 11:25:21 +00:00
Alex Gleason
c73c8bc44e Refactored field animation and better block delete transition 2015-10-27 11:25:21 +00:00
Alex Gleason
bad069ffb8 Reset the position of the Hallo bar after the input fields expand 2015-10-27 11:25:21 +00:00
Alex Gleason
015e9da9b8 Field expand animation and button hover fixes 2015-10-27 11:25:21 +00:00
Matt Westcott
d089794953 Merge branch 'mrnix-stylefixes' 2015-10-27 11:19:59 +00:00
Matt Westcott
e68d66a744 Release note for #1869 2015-10-27 11:19:44 +00:00
Sergey Nikitin
1742220c4e .xdsoft_datetimepicker z-index: 5 2015-10-27 13:47:25 +03:00
Karl Hobley
19d476b42a Changelog/release notes for #1857 and #1866 2015-10-27 10:22:40 +00:00
Karl Hobley
ed9d3d72b9 Merge pull request #1857 from laidibug/issue/1690
Apply dropdown styling to foreign key fields
2015-10-27 10:17:22 +00:00
Karl Hobley
7a22d1c248 Merge pull request #1866 from gasman/feature/redirect-site-field
Make Site field editable on redirects
2015-10-27 10:16:39 +00:00
Matt Westcott
42860fba21 Merge branch 'vden-nodev4-support' 2015-10-27 10:05:21 +00:00
Matt Westcott
ba8c02268d Merge branch 'nodev4-support' of https://github.com/vden/wagtail into vden-nodev4-support 2015-10-27 10:02:02 +00:00
Karl Hobley
3d5dd9edbd Merge pull request #1868 from takeflight/bug/remove-six
Use six from Django, remove six from tox.ini
2015-10-27 09:22:55 +00:00
Tim Heap
b3560b7941 Use six from Django, remove six from tox.ini
All referencs to `six` were removed in #1411 favouring
`django.utils.six`, except for one in `tox.ini` where it was installed
as a dependency. Because it was still installed in the test environment,
a few references to `six` crept back in. These will cause an ImportError
when users do not have `six` installed.

These references have been fixed, and `six` has been removed from
`tox.ini`
2015-10-27 16:37:05 +11:00
Matt Westcott
e0f7e3d11d Allow re-using the same redirect path on multiple sites - fixes #1672 2015-10-27 01:32:49 +00:00
Matt Westcott
1033897146 Add site column to redirects listing (and show redirects from all sites, not just current one) 2015-10-27 00:42:21 +00:00
Matt Westcott
b0878b1534 Make site field editable on redirects 2015-10-27 00:36:33 +00:00
Matt Westcott
93cf24df73 Add tests for page redirects and redirects with specific sites 2015-10-27 00:18:20 +00:00
Matt Westcott
d76ada4636 No need to create our own Client instance when using django.test.TestCase 2015-10-26 22:47:28 +00:00
Matt Westcott
6cba9ff204 PEP8 on wagtailredirects/tests.py 2015-10-26 22:47:27 +00:00
Matt Westcott
cdf8467bd2 Remove redundant use of EditHandler in wagtailredirects 2015-10-26 22:47:27 +00:00
Matt Westcott
13c8e4da58 Merge branch 'vden-gravatar-idn-email-fix' 2015-10-26 12:58:53 +00:00
Matt Westcott
566fa3a26f Release note for #1670 / #1850 / #1854 2015-10-26 12:58:36 +00:00
Matt Westcott
d1ef42fe9b test for #1670 2015-10-26 12:35:58 +00:00
Denis Voskvitsov
0deb2da1af More readable gravatar url formatting 2015-10-26 12:35:58 +00:00
Denis Voskvitsov
9277e8350c PEP8 2015-10-26 12:35:58 +00:00
Denis Voskvitsov
0f9eaf7e8c Force utf-8 encoding of user email in gravatar request 2015-10-26 12:35:58 +00:00
Matt Westcott
838e03a2b5 Merge pull request #1863 from whyfoo/patch-2
Removed backticks from readme
2015-10-23 21:12:16 +01:00
Matt Westcott
f60387eb9b Merge pull request #1862 from whyfoo/patch-1
Minor readme tweak
2015-10-23 21:11:58 +01:00
[Redacted]
199ed87c26 Removed backticks from readme
Forgot to remove backticks from sphinx
2015-10-23 22:04:56 +02:00
[Redacted]
8cd6dfe87b Minor readme tweak 2015-10-23 22:02:07 +02:00
Matt Westcott
8c6ffa6f48 Merge branch 'alexgleason-streamfield-hover-jitter' 2015-10-23 12:31:16 +01:00
Matt Westcott
d06c5070cc Release note for #1725 2015-10-23 12:31:07 +01:00
Alex Gleason
a89b981a47 Fixed StreamField hover jitter 2015-10-23 12:27:21 +01:00
Matt Westcott
f2df102aac Merge branch 'kaedroho-fix/1859' 2015-10-23 12:22:42 +01:00
Matt Westcott
2631067554 Merge branch 'fix/1859' of https://github.com/kaedroho/wagtail into kaedroho-fix/1859 2015-10-23 12:16:21 +01:00
Matt Westcott
dc02375cc8 Merge branch 'takeflight-merge-settings' 2015-10-23 11:54:47 +01:00
Matt Westcott
a51fdf1279 Release note for #1754 2015-10-23 11:54:27 +01:00
Matt Westcott
735082e927 use URL namespace for wagtailsettings 2015-10-23 11:41:28 +01:00
Karl Hobley
12c58384b2 Tests for searching with multiple fields 2015-10-23 11:40:18 +01:00