Commit graph

2631 commits

Author SHA1 Message Date
Dave Cranwell
0f6b6784dc fixing incorrect test import 2014-06-17 09:45:42 +01:00
Karl Hobley
f4245815ba Added sitemap generator 2014-06-17 09:37:35 +01:00
Dave Cranwell
b638cc01e9 Merge branch 'master' into feature/styleguide 2014-06-17 09:36:21 +01:00
Dave Cranwell
7184d6f6d2 font tweaks 2014-06-16 17:28:42 +01:00
Dave Cranwell
2bd1e0076b tweaks to font metrics 2014-06-16 17:10:26 +01:00
Dave Cranwell
506d977950 typo in comment 2014-06-16 15:32:32 +01:00
Karl Hobley
4136bb5053 Added tests for db6bb92 2014-06-16 15:15:38 +01:00
Karl Hobley
db6bb920fb Set treebeard attributes in preview on create view. Fixes #320 2014-06-16 14:57:33 +01:00
Dave Cranwell
7f72bdd917 Merge remote-tracking branch 'upstream/master' into feature/better-modals 2014-06-16 13:19:45 +01:00
Dave Cranwell
bd0a18dc13 tidied image chooser.js 2014-06-16 13:18:27 +01:00
Dave Cranwell
ba15fbead1 added better comments. tweaked when modal is shown 2014-06-16 13:06:02 +01:00
Dave Cranwell
b5dc5a9516 tweaks to make modals fade better 2014-06-16 12:59:43 +01:00
Karl Hobley
5bfa8d6b07 Merge pull request #291 from kaedroho/issue-25
Made login view redirect already logged in users to dashboard.
2014-06-16 12:10:17 +01:00
Karl Hobley
ee222a387b Merge remote-tracking branch 'torchbox/master' into issue-25
Conflicts:
	runtests.py
2014-06-16 10:40:31 +01:00
Karl Hobley
614cd6d028 Merge pull request #281 from kaedroho/tests-changes
Tests changes
2014-06-16 10:38:52 +01:00
Karl Hobley
4235450f5e Minor PEP8 fix 2014-06-16 10:31:05 +01:00
Karl Hobley
02b4223e41 Improvements to page chooser tests 2014-06-16 10:28:59 +01:00
Karl Hobley
1d7cc2b3aa Merge branch 'master' into tests-changes
Conflicts:
	wagtail/wagtailembeds/tests.py
	wagtail/wagtailsnippets/tests.py
2014-06-16 10:23:21 +01:00
Karl Hobley
aef892dc5b Merge pull request #311 from helenwarren/master
Fix behaviour described in issue 77. Specifically validate that for an e...
2014-06-16 10:08:08 +01:00
Karl Hobley
a60af70dfe Docs fix: Elasticutils 0.9+ is not supported 2014-06-16 09:49:01 +01:00
Neal Todd
7a709709e9 Doc fix - use https rather than ssh for wagtaildemo clone 2014-06-16 09:39:06 +01:00
Ben Margolis
ac87fe65be fix a typo and spacing 2014-06-15 22:49:47 -07:00
Ben Margolis
c880ef3b84 Update forms.py 2014-06-15 22:46:27 -07:00
Ben Margolis
138b3ba285 first pass of multi-uploader 2014-06-15 22:35:01 -07:00
Dave Cranwell
dae521aec8 removed redundant script block 2014-06-13 17:21:51 +01:00
Dave Cranwell
16ca198377 Merge remote-tracking branch 'upstream/master' 2014-06-13 17:09:46 +01:00
Dave Cranwell
d6aa265666 all fields now display required asterisk when necessary 2014-06-13 17:08:56 +01:00
Dave Cranwell
72a43567d2 tweaked transition 2014-06-13 16:15:37 +01:00
Dave Cranwell
438ce4aba5 improvements from kaedroho feedback 2014-06-13 15:40:06 +01:00
Karl Hobley
213df7c4f3 Merge pull request #316 from mope/313-query-string-crash
Truncate long search strings
2014-06-13 14:44:18 +01:00
Tom Talbot
cc2d8b6873 Truncate long search strings
Search query strings must not exceed 255 characters; they will be
truncated if they do. Also added embedly library for Travis.
2014-06-13 14:18:16 +01:00
Dave Cranwell
cbd47f3941 Aesthetic improvements to preview experience. Loading spinner now uses wagtail's standard glyph. 2014-06-13 13:33:01 +01:00
Karl Hobley
25b7bf598e Merge pull request #314 from mope/whitelist-tests
Add unit tests for wagtailcore/whitelist.py
2014-06-13 11:49:15 +01:00
Tom Talbot
ff5879def9 Add unit tests for wagtailcore/whitelist.py 2014-06-13 10:24:32 +01:00
Tom Dyson
89f5ada464 Merge pull request #310 from sixpearls/docs/image_formats
Adding basic documentation for the image_formats feature.
2014-06-13 09:16:13 +01:00
Matt Westcott
8368837e2c fix styling of preview button on create page when there are multiple preview modes 2014-06-12 16:52:52 +01:00
Dave Cranwell
b4493af8b9 icomoon project file updated 2014-06-12 16:15:57 +01:00
Dave Cranwell
b038b6dbe7 fixing positioning of multiple panels relative to their controls 2014-06-12 16:14:15 +01:00
Dave Cranwell
f2766921ee tweaking tabs 2014-06-12 16:06:45 +01:00
Dave Cranwell
b0d5b7cf95 tweaking size of snippet icon 2014-06-12 16:04:14 +01:00
Dave Cranwell
0faad897b8 updated font to include new padlock symbols 2014-06-12 16:00:31 +01:00
Dave Cranwell
7a290ead90 margin causing problems in login screen solved 2014-06-12 14:09:47 +01:00
Helen Warren
362cdbfc08 Merge branch 'master' of github.com:torchbox/wagtail 2014-06-12 12:17:29 +01:00
Dave Cranwell
e2dd56a822 Merge pull request #308 from takeflight/master
Removed _blank from recently edited items screen
2014-06-11 21:37:08 +01:00
Karl Hobley
58f8bef4b1 Merge pull request #287 from mope/more-unit-tests
Unit tests for wagtail admin chooser and embeds
2014-06-11 14:19:44 +01:00
Matt Westcott
ef16c7a943 Merge branch 'kaedroho-get_context-args-kwargs' 2014-06-11 12:01:35 +01:00
Matt Westcott
3767070169 Merge branch 'get_context-args-kwargs' of https://github.com/kaedroho/wagtail into kaedroho-get_context-args-kwargs 2014-06-11 11:58:56 +01:00
Helen Warren
6eec08dfbe Fix behaviour described in issue 77. Specifically validate that for an editors pick a search term/phrase must be defined and at least one valid page recommendation specified. 2014-06-11 11:51:33 +01:00
Tom Talbot
04ca623c96 Merge branch 'master' into more-unit-tests 2014-06-11 11:02:45 +01:00
Tom Talbot
200854b705 Move chooser tests from tests.py to test_page_chooser.py 2014-06-11 10:59:27 +01:00