mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
1 425 Commity
54 Gałęzie
255 Tagi
478 MiB
Wykres commitów

1425 Commity (a5376dd2ea0a18008441f487cba5967a223cca94)

Autor SHA1 Wiadomość Data
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
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
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
Karl Hobley 28c071a1e9 Merge pull request #372 from kaedroho/wagtailcore-cleanup-2 
Wagtailcore cleanup
 2014-06-27 15:21:09 +01:00
Nick Smith e87e9eebc2 Modify tests to include ports differently, add tests for unrecognised ports 2014-06-27 15:15:39 +01:00
Dave Cranwell 7bbde27e83 fix to dropdown lists 2014-06-27 14:56:03 +01:00
Nick Smith 1ac20bc766 Change the way we lookup the request port 2014-06-27 12:49:22 +01:00
Dave Cranwell 8608427359 Merge branch 'master' into scheduled-publishing 2014-06-27 12:41:50 +01:00
Dave Cranwell 1f2cc54cf7 Merge remote-tracking branch 'upstream/master' 2014-06-27 12:40:55 +01:00
Dave Cranwell 77def962a7 hallo toolbar buttons reduced in height 2014-06-27 12:40:36 +01:00
Dave Cranwell 5635bd0949 merge master, resolved merge conflict, moved settinsg tab back left 2014-06-27 12:39:06 +01:00
Karl Hobley 56b9f5a662 Merge pull request #292 from kaedroho/formbuilder-tests 
Formbuilder tests
 2014-06-27 12:26:24 +01:00
Karl Hobley 749df44e06 Revert "Split wagtailforms landing page into separate view" 
This reverts commit 21ac2e3ab8.
 2014-06-27 12:17:57 +01:00
Karl Hobley 09bf8ceb9c Merge branch 'master' into formbuilder-tests 2014-06-27 12:16:40 +01:00
Dave Cranwell f026bb6911 added missing title tags to account pages 2014-06-27 12:09:00 +01:00
Dave Cranwell b8af7b6abc Merge remote-tracking branch 'upstream/master' 2014-06-27 12:03:58 +01:00
Tom Talbot f6c946af49 Merge branch 'master' into even-more-unit-tests 2014-06-27 12:03:11 +01:00
Dave Cranwell d345ad9299 Merge remote-tracking branch 'upstream/master' 2014-06-27 12:03:11 +01:00
Dave Cranwell 10bc40098f tweak to notifications styling 2014-06-27 12:02:48 +01:00
Karl Hobley b4dc860287 Changelog entry for #300 2014-06-27 12:02:34 +01:00
Karl Hobley 1671b2cfa8 Merge branch 'pr/301' 
Conflicts:
	CHANGELOG.txt
 2014-06-27 12:01:46 +01:00
Karl Hobley a41292a37e Merge branch 'pr/300' 2014-06-27 12:01:17 +01:00
Dave Cranwell 311156a757 Merge remote-tracking branch 'upstream/master' 2014-06-27 11:56:27 +01:00
Karl Hobley e0fb57d718 Minor coding style fix 2014-06-27 11:52:02 +01:00
Dave Cranwell 97e815903e replacing lines from another botched merge 2014-06-27 11:49:55 +01:00