Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-28 18:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
780 commits 30 branches 112 tags 89 MiB
Commit graph

780 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeffrey Hearn
73fa1000b1 editing api started 2014-05-19 21:14:45 -04:00
Jeffrey Hearn
508a595f7b Merge branch 'master' of github.com:torchbox/wagtail into docs 2014-05-19 18:05:08 -04:00
Karl Hobley
7c99fa664c Don't check internal file formatl if image is closed 2014-05-19 11:38:22 +01:00
Karl Hobley
e4401ba44a Revert "Reopen images for validation if they are closed" 
This reverts commit 7d43b1cf6e.
 2014-05-19 11:37:13 +01:00
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
Jeffrey Hearn
d617aa3a0e Merge branch 'master' of github.com:torchbox/wagtail into docs 2014-05-18 01:29:50 -04:00
Jeffrey Hearn
bfc53dd6ce added request lifestyle introduction 2014-05-18 01:21:17 -04:00
Jeffrey Hearn
446c053a17 more model basics 2014-05-17 20:54:36 -04: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
Jeffrey Hearn
62f3ecaa9b another placeholder 2014-05-16 12:10:46 -04:00
Jeffrey Hearn
d7d096d89f bleh that merge sucked 2014-05-16 12:09:03 -04:00
Jeffrey Hearn
04e56198ff placeholders added 2014-05-16 12:02:32 -04:00
Jeffrey Hearn
2833c66c0f Merge branch 'master' of github.com:torchbox/wagtail into docs 2014-05-16 11:34:50 -04:00
Jeffrey Hearn
da2c69a5ee Routes 2014-05-15 22:50:26 -04:00
Jeffrey Hearn
65b9899269 Routes 2014-05-15 22:41:13 -04: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
Jeffrey Hearn
a2ed70bd8d Snippets and some reorg 2014-05-13 22:38:44 -04:00
Jeffrey Hearn
b42a0d2cf0 Merge branch 'master' of github.com:torchbox/wagtail into docs 2014-05-13 19:00:50 -04:00
Karl Hobley
5474f7ef39 Embeds: Catch TypeErrors when casting width and height to integers 2014-05-13 17:18:33 +01:00
Jeffrey Hearn
e37b6f6a5f ugh neck hurt 2014-05-12 21:25:26 -04:00
Jeffrey Hearn
66d29b37df done with search docs 2014-05-11 20:07:40 -04: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
Jeffrey Hearn
c4b5f09eac Async search docs done 2014-05-10 16:52:19 -04:00
Jeffrey Hearn
206a3e3732 Async search docs done 2014-05-10 16:49:05 -04: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
Jeffrey Hearn
876283debf omg search 2014-05-10 01:35:52 -04:00
Jeffrey Hearn
cb3c41222c omg search 2014-05-10 01:23:58 -04:00
Karl Hobley
27debc3289 Fixed crash when an invalid width is send by oembed provider 2014-05-09 12:59:25 +01:00
Jeffrey Hearn
e6df0ef01f stuff 2014-05-08 21:01:47 -04:00
Jeffrey Hearn
bb28928160 Merge branch 'master' of github.com:torchbox/wagtail into docs 2014-05-08 18:36:57 -04: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
Jeffrey Hearn
1aa04c277d moar docs 2014-05-08 00:11:47 -04:00
Jeffrey Hearn
89d774da76 moar docs 2014-05-07 14:39:07 -04:00
Jeffrey Hearn
af881e0789 moar docs 2014-05-07 14:36:56 -04:00
Jeffrey Hearn
b614781e9c moar docs 2014-05-07 14:35:38 -04:00
Jeffrey Hearn
1bd49f85e1 moar docs 2014-05-07 14:31:48 -04:00