Commit graph

1453 commits

Author SHA1 Message Date
Karl Hobley
26e42e5529 ImageModel => Image 2014-07-15 16:05:02 +01:00
Karl Hobley
1da6824e67 Cleaned up unused imports 2014-07-15 16:05:02 +01:00
Karl Hobley
969f3de2b7 Added missing import 2014-07-15 16:05:02 +01:00
Karl Hobley
bd9d18a0d7 Use render() shortcut in images/multiple views 2014-07-15 16:05:02 +01:00
Karl Hobley
6d3bb2240d PEP8 fixes 2014-07-15 16:04:58 +01:00
Dave Cranwell
3d14d8e628 tweaks for ie11 2014-07-07 11:53:55 +01:00
Dave Cranwell
4860399034 tidying 2014-07-07 10:34:58 +01:00
Dave Cranwell
85c9e3eaaf getting tag fields working 2014-07-07 10:34:12 +01:00
Dave Cranwell
508e85a0cb further tweaks to upload ui 2014-07-07 10:14:23 +01:00
Dave Cranwell
936c104187 ajax form fixed 2014-07-04 17:15:53 +01:00
Dave Cranwell
1122387626 ongoing styling of multi-upload 2014-07-04 17:07:35 +01:00
Dave Cranwell
3dc1b51a0e Merge branch 'master' into feature/multi-image-upload 2014-07-04 15:35:00 +01:00
Dave Cranwell
09cdc99ff2 Addressing issue where ordering of new inlinepanel items created two items of the same order 2014-07-03 10:14:01 +01:00
Dave Cranwell
f7b9390202 removed max-height transition until it can be done without bad effects on long forms 2014-07-02 11:16:13 +01:00
Dave Cranwell
f3a70c9f29 correctly formatted query chooser modal content 2014-07-02 10:21:28 +01:00
Dave Cranwell
7ddcf0fbac Fixing #402, missing chooser button. Field inherited wrong template. 2014-07-02 10:17:21 +01:00
Dave Cranwell
7e65a4d578 button metrics at mobile improved 2014-07-02 10:08:31 +01:00
Dave Cranwell
bdf175ae41 fixed: generated content font size bug in IE 2014-07-02 09:52:55 +01:00
Tom Dyson
479dd1edde Minor editing API doc tweaks 2014-07-01 16:53:47 +01:00
Tom Dyson
83161e324f Updates to management commands docs
With inclusion in index
2014-07-01 16:45:44 +01:00
Dave Cranwell
a5376dd2ea Merge remote-tracking branch 'upstream/master' 2014-07-01 15:40:06 +01:00
Dave Cranwell
eb1e8b0f87 Fixed: 'use strict' caused undeclared variable to prevent preview 2014-07-01 15:39:25 +01:00
Karl Hobley
2dd45a8e71 Merge pull request #386 from torchbox/scheduled-publishing
Scheduled publishing
2014-07-01 14:13:05 +01:00
Karl Hobley
ebd73184bf Fixed migration conflict 2014-07-01 14:04:31 +01:00
Karl Hobley
96977878bc Merge remote-tracking branch 'torchbox/master' into scheduled-publishing 2014-07-01 14:02:46 +01:00
Dave Cranwell
e93831bd72 merge conflict in page-editor.scss resolved. Login styles updated to suit new use of iconfield 2014-07-01 13:58:15 +01:00
Karl Hobley
3933f0954e Merge pull request #371 from nimasmi/site_model_adjustments
Site model adjustments
2014-07-01 13:58:13 +01:00
Dave Cranwell
5f1eee4f46 updated docs re: FieldRowPanel 2014-07-01 13:31:55 +01:00
Karl Hobley
1142123174 Added basic documentation for management commands 2014-06-30 13:34:37 +01:00
Karl Hobley
c4c66ba780 Added check to page create view to make sure the selected class is a descendant of Page 2014-06-30 10:41:10 +01:00
Karl Hobley
50a5182794 Fixed typos in a couple of deprecation warnings 2014-06-30 10:37:02 +01:00
Dave Cranwell
9c9cb400e7 fixing buttons that were hidden after previous button styling work 2014-06-30 10:32:06 +01:00
Karl Hobley
42037419b0 Removed duplicate test 2014-06-30 10:29:17 +01:00
Karl Hobley
0cec7587ce Removed some unneeded code 2014-06-30 10:22:06 +01:00
Karl Hobley
61599b07dd Made scheduled publish errors into field errors 2014-06-30 10:22:06 +01:00
Karl Hobley
1736b8173c Put back some missing tests 2014-06-30 10:22:00 +01:00
Dave Cranwell
5f450d1f03 stray > removed 2014-06-30 10:16:19 +01:00
Dave Cranwell
419b562f64 ongoing work on multi uploader 2014-06-30 09:27:44 +01:00
Karl Hobley
f9d7e9c2dd Merge pull request #384 from kaedroho/deprecation-warning-cleanup
Fixed useages of deprecated templatetags
2014-06-28 19:15:28 +01:00
Karl Hobley
1cc68807ea Merge branch 'master' into scheduled-publishing
Conflicts:
	wagtail/wagtailcore/models.py
2014-06-27 16:54:35 +01:00
Karl Hobley
8315370e63 Fixed useages of deprecated templatetags 2014-06-27 16:45:01 +01:00
Nick Smith
69d2797b9c Merge branch 'master' into site_model_adjustments
Conflicts:
	wagtail/wagtailcore/models.py
2014-06-27 16:23:15 +01:00
Dave Cranwell
9b336f5bac merged amster 2014-06-27 16:21:50 +01:00
Nick Smith
1aad1e55c2 Refactor port/site tests into new test case and individual tests 2014-06-27 16:20:09 +01:00
Nick Smith
3cac8ea387 Add test that requests on unrecognised ports are routed to the expected site if no ambiguity 2014-06-27 16:19:10 +01:00
Karl Hobley
3fe4eb597e Merge pull request #362 from mope/rich-text-unit-tests
Rich text unit tests
2014-06-27 15:51:15 +01:00
Karl Hobley
f9469b39a0 Fixed missing import 2014-06-27 15:46:57 +01:00
Karl Hobley
2051de4fe0 Improved backwards compatibility of template tags rationalisation 2014-06-27 15:45:17 +01:00
Karl Hobley
e8ee5a347b Merge pull request #375 from mope/even-more-unit-tests
Add unit tests for image formats and embeds template tags
2014-06-27 15:32:48 +01:00
Karl Hobley
6e6b85d4f6 Merge pull request #336 from kaedroho/feature/template-tags-rationalisation
Template tags rationalisation
2014-06-27 15:22:22 +01:00