Wykres commitów

750 Commity (7159d246d8dd30763ee06ebfa6822e2ac6dbe78c)

Autor SHA1 Wiadomość Data
Karl Hobley 7159d246d8 Merge branch 'image-validation-fix' 2014-05-19 10:53:07 +01:00
Karl Hobley 7d43b1cf6e Reopen images for validation if they are closed 2014-05-19 10:52:49 +01:00
Karl Hobley e00bf58914 Merge pull request #252 from kaedroho/image-validation-fix
More robust image file validation
2014-05-19 09:59:13 +01:00
Karl Hobley b0c069d446 More robust image file validation
Previously, it was possible to upload PSD files by simply renaming them to have a '.jpg' extension.

This causes issues as wagtailimages cannot resize PSD files causing crashes.

This commit fixes this by validating that the internal format of the file matches the extension.
2014-05-19 09:56:49 +01:00
Matt Westcott 7a9e214fb5 Remove dead code for creating pages by type and then location; it's been unused since wagtail 0.1, hasn't been updated for the page permission model, and needs further spec / discussion (including a working subpage_types implementation) before it can return 2014-05-17 16:00:19 +02:00
Matt Westcott f2b6b01838 Merge branch 'sixpearls-fix/remove_raw_sql' 2014-05-17 15:12:43 +02:00
Matt Westcott ed36f25bff Add Ben Margolis to contributors 2014-05-17 15:12:18 +02:00
Matt Westcott ac5e903c5e Merge branch 'fix/remove_raw_sql' of https://github.com/sixpearls/wagtail into sixpearls-fix/remove_raw_sql 2014-05-17 15:00:13 +02:00
Matt Westcott 9c5a88e581 Merge branch 'kaedroho-tests-changes' 2014-05-17 12:11:23 +02:00
Matt Westcott 398a208066 Merge branch 'tests-changes' of https://github.com/kaedroho/wagtail into kaedroho-tests-changes 2014-05-17 11:49:22 +02:00
Ben Margolis 09f185b3aa Remove all (3) raw SQL statements. This will allow Django to generate the statements, so there aren't any backend issues 2014-05-15 15:29:23 -07:00
Karl Hobley 5474f7ef39 Embeds: Catch TypeErrors when casting width and height to integers 2014-05-13 17:18:33 +01:00
Matt Westcott 1ecc215759 Add mechanism for apps to register their own hallo.js plugins 2014-05-10 23:54:32 +01:00
Matt Westcott 4785a41c38 Move chooserUrls definitions into their respective apps 2014-05-10 23:42:49 +01:00
Matt Westcott fd737f0ab0 Have wagtaildocs, wagtailembeds, wagtailimages and wagtailsnippets register their page editor JS components through the insert_editor_js hook, rather than hard-coding them into _editor_js.html 2014-05-10 19:35:51 +01:00
Karl Hobley 4786e34a46 Import unittest2 from Django 2014-05-10 13:21:21 +01:00
Karl Hobley 27debc3289 Fixed crash when an invalid width is send by oembed provider 2014-05-09 12:59:25 +01:00
Dave Cranwell 280d960829 fixing save button on page creation 2014-05-08 12:10:06 +01:00
Dave Cranwell 6acb81dc78 Merge branch 'feature/pagemodes' 2014-05-08 11:56:46 +01:00
Dave Cranwell 96b6845e72 updated drop-ups for new preview button. improved icon rendering on windows generally. 2014-05-08 11:52:39 +01:00
Matt Westcott 541c4b37ff use url_info.hostname rather than url_info.netloc when building dummy request headers - netloc includes port number for non-standard ports, which we don't want 2014-05-08 10:55:47 +01:00
Dave Cranwell 532309d9eb Merge remote-tracking branch 'upstream/feature/pagemodes' into feature/pagemodes 2014-05-08 09:39:28 +01:00
Karl Hobley 13d546e835 Merge pull request #226 from kaedroho/embeds_author-and-provider-fields
Add author_name and provider_name to Embed
2014-05-02 13:58:54 +01:00
Karl Hobley ebd063ad15 Merge pull request #227 from kaedroho/issue/7-and-157
Clear 'wagtail_site_root_paths' when a site root page is saved fixes #7 #157
2014-05-02 13:50:34 +01:00
Karl Hobley 012a78b0de Added changelog entry 2014-05-02 13:49:44 +01:00
Karl Hobley c50532a5fc Added docstrings to issue 7 and 157 testcases 2014-05-02 13:30:09 +01:00
Karl Hobley d6cce69a39 Clear 'wagtail_site_root_paths' when a site root page is saved fixes #7 fixes #157 2014-05-02 13:10:55 +01:00
Karl Hobley 913f21d09b Test for issue 7 now fails consistantly 2014-05-02 13:02:25 +01:00
Karl Hobley d24fe52d53 Added test for issue 157 2014-05-02 13:00:14 +01:00
Karl Hobley 226b760dc3 Merge branch 'master' into issue/7-and-157 2014-05-02 12:34:51 +01:00
Karl Hobley 20a69ff1a9 Merge pull request #225 from kaedroho/db-cache
Use database cache for testing
2014-05-02 12:33:45 +01:00
Karl Hobley 503f1cbaf8 Added comment into runtests.py to explain why we're using DatabaseCache 2014-05-02 12:33:20 +01:00
Karl Hobley 17aa3fc89e Cleanup wagtailembeds
Use templates for rendering embeds
Fixed issue with invalid javascript being returned by the chooser
2014-05-02 12:15:27 +01:00
Karl Hobley 7fe6e2177a Added changelog entry 2014-05-02 12:02:57 +01:00
Karl Hobley a27bc5f237 Display embed author/provider in admin if set 2014-05-02 12:01:40 +01:00
Karl Hobley db5559b688 Embeds: Save author_name and provider_name if set 2014-05-02 11:54:20 +01:00
Karl Hobley a771e6adc4 Added author_name and provider_name fields to Embed model 2014-05-02 11:51:41 +01:00
Karl Hobley 360174e230 Use database cache for testing
Currently, the cache is not flushed between tests.

This can cause false positives where a previous test has been messing with cache keys which a future test uses (eg, wagtail_root_paths)

This commit makes django use the database as the cache which is automatically flushed between tests
2014-05-02 11:45:31 +01:00
Karl Hobley e681e3aeee Fixed an issue with issue 7 unit test 2014-05-02 11:13:18 +01:00
Karl Hobley 2463152d4c Created unit test to reproduce issue 7 2014-05-02 10:44:35 +01:00
Matt Westcott cfcc67f514 Wrap the output of the richtext filter in a 'rich-text' div - fixes #224 2014-05-02 10:01:55 +01:00
Matt Westcott ec99bfed84 add changelog entry for richtext change 2014-05-02 10:00:14 +01:00
Matt Westcott ef9e877fa9 remove mysql from tox tests for now, until we can fix the foreign key constraint error in wagtail.wagtailimages.tests.TestImageEditView 2014-05-01 14:48:51 +01:00
Matt Westcott ba339a0bfb Add @kryton's fix for MySQL support in _update_descendant_url_paths, from #215 2014-05-01 13:06:20 +01:00
Matt Westcott 419b671fcc Use @transaction.atomic rather than the deprecated (as of Django 1.6) commit_on_success 2014-05-01 12:57:18 +01:00
Matt Westcott 178a235d2d Add unit test for moving pages 2014-05-01 12:56:31 +01:00
Matt Westcott 16ca3ce280 Add MySQL to tox tests 2014-05-01 12:21:17 +01:00
Matt Westcott afe2fc10a8 add David Smith to contributors 2014-05-01 11:21:45 +01:00
David Smith 1d1accd5f9 Password reset templates extend admin_base to apply styles correctly, and missing % in title block 2014-05-01 11:18:35 +01:00
Dave Cranwell 98d616de90 Merge pull request #201 from davecranwell/master
Added pagination to list of pages using a given content type
2014-04-30 11:36:42 +01:00