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
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
Robert Clark
bc99de529b
page type business rules
2014-05-13 12:46:20 -04:00
Dave Cranwell
49c5f762df
fixing height of header
2014-05-13 17:19:41 +01:00
Karl Hobley
5474f7ef39
Embeds: Catch TypeErrors when casting width and height to integers
2014-05-13 17:18:33 +01:00
Dave Cranwell
f4588a3668
ongoing tweaks to how fields are rendered
2014-05-13 17:03:31 +01:00
Dave Cranwell
6f5203c6fd
Medium-scale changes to fields to allow 'iconfields' and header refactored into own css file
2014-05-13 15:51:28 +01:00
Dave Cranwell
5a840c421b
added form icon to font, font icomoon project and styleguide
2014-05-13 13:05:46 +01:00
Dave Cranwell
aa41a5e8a9
updating header form style
2014-05-13 12:45:49 +01:00
Dave Cranwell
0da3fa85d7
updated templates so that pagination of form pages is possible as well as pagination of submissions
2014-05-13 12:19:04 +01:00
Dave Cranwell
c69df32deb
tweaks to all forms globally, to use left-aligned labels at desktop resolutions
2014-05-13 11:28:01 +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
Matt Westcott
64357dc5e0
Merge branch 'master' into form-builder
...
Conflicts:
wagtail/tests/fixtures/test.json
wagtail/wagtailcore/tests.py
2014-05-09 09:57:40 +01:00
wwj718
abdab87ec3
Translated wagtailadmin into Chinese language.
2014-05-09 13:05:10 +08:00
tulpar008
cf99f5f9f0
translate :34
2014-05-09 11:45:52 +08: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
c20b544b31
jqui smoothness no longer required. minor updates to date picker and added datepicker and timepicker to styleguide
2014-05-08 17:38:00 +01:00
Dave Cranwell
cd702d99de
fixing position of jquery ui widgets
2014-05-08 16:51:28 +01:00
Dave Cranwell
acf15a1f1a
message padding on mobile fixed
2014-05-08 16:34:01 +01:00
Dave Cranwell
d79e3ec09a
fixing nice padding not working on header
2014-05-08 16:32:41 +01:00
Dave Cranwell
c7ab17eaba
updated messages to use icons
2014-05-08 16:05:12 +01:00
Dave Cranwell
8eac686981
updated font to include new date icon
2014-05-08 16:00:24 +01:00
Dave Cranwell
72b1050e18
added icomoon json file to allow edits to font by anyone importing the json to icomoon
2014-05-08 15:51:30 +01:00
Dave Cranwell
fff332a196
updates to tabs
2014-05-08 15:29:12 +01:00
Dave Cranwell
27889478d2
tweaks and change to space indenting
2014-05-08 15:13:19 +01:00
Dave Cranwell
0f3b74817f
updates to styleguide
2014-05-08 14:26:32 +01:00
Dave Cranwell
d88d562a99
merged upstream/master
2014-05-08 12:41:11 +01:00
Dave Cranwell
af20a61b6b
reducing shadow on menu. looked amateurish
2014-05-08 12:31:49 +01:00