Tom Dyson
c349f06d6a
Missing underline for new static generation docs
2014-05-20 17:22:19 +01:00
Dave Cranwell
77da201964
Merge remote-tracking branch 'upstream/form-builder' into form-builder
2014-05-20 16:33:44 +01:00
Matt Westcott
d096b14132
Remove label_suffix from form builder forms by default, but make that preference overrideable in the FormPage class
2014-05-20 16:16:26 +01:00
Matt Westcott
3e152e0386
fix unit tests to handle form_pages being a paginator.Page instance
2014-05-20 14:53:02 +01:00
Matt Westcott
725a79f593
Merge pull request #249 from kaedroho/medusa-integration
...
Django-medusa
2014-05-20 14:39:02 +01:00
Dave Cranwell
2aaec7c332
reordered fields
2014-05-20 14:38:22 +01:00
Karl Hobley
9d65cf8f12
Added changelog entry
2014-05-20 13:48:02 +01:00
Dave Cranwell
7b98664cd0
unrelated fix for IE
2014-05-20 13:22:32 +01:00
Dave Cranwell
27333b1ea1
updated formbulider fields with identifyable class names, although not output yet
2014-05-20 13:22:19 +01:00
Karl Hobley
61779be5c9
Added unit tests for get_static_site_paths
2014-05-20 13:04:47 +01:00
Karl Hobley
c194a55304
Renamed get_staticsite_paths to get_static_site_paths
2014-05-20 12:39:23 +01:00
Karl Hobley
8c4c268641
Added *args, *kwargs paramters to serve/get_context/get_template
...
This makes it easier to pass parameters from the route method down to get_context/get_template
2014-05-20 11:23:36 +01:00
Karl Hobley
9564cbf39f
Added document describing how to generate a static website
2014-05-20 11:17:49 +01:00
Matt Westcott
26183e608b
mention some more optional/required dependencies in 'getting started' docs
2014-05-20 11:05:19 +01:00
Dave Cranwell
7d88d285cd
updated login styles to match new 'iconfield' implementation
2014-05-20 10:41:08 +01:00
Dave Cranwell
05cbcd7546
merging master
2014-05-20 10:28:03 +01:00
Dave Cranwell
4111baf933
font size fix for login form icons
2014-05-20 10:25:14 +01:00
Dave Cranwell
3a0285fae4
Merge remote-tracking branch 'upstream/master'
2014-05-20 10:16:36 +01:00
Dave Cranwell
eb704fc5a9
added scrollable form submissions tables
2014-05-20 10:11:03 +01:00
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
b5d4c0e78a
Renamed get_medusa_paths to get_staticsite_paths
2014-05-19 17:10:19 +01:00
Karl Hobley
f4040a648d
Added medusa renderer for documents
2014-05-19 16:55:48 +01:00
Karl Hobley
4207a0b3b8
Moved medusa renders into their own app in contrib
2014-05-19 16:51:08 +01:00
Karl Hobley
e2930ab6bc
Added contrib folder
2014-05-19 16:45:56 +01:00
Karl Hobley
d364f95413
Fixed typo
2014-05-19 14:03:11 +01: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
Karl Hobley
d180ad8f08
Added medusa renderer for pages
2014-05-16 12:27:05 +01:00
Karl Hobley
6092791b86
Added get_medusa_paths method to Page
...
This is used to find a list of URLs for the entire site to feed into django-medusa
If your page requires extra views, you can override this like so:
def get_medusa_paths(self):
yield '/myextraview/'
super(MyPageType, self).get_medusa_paths()
2014-05-16 12:17:17 +01: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
