Commit graph

2553 commits

Author SHA1 Message Date
Matt Westcott
1d916ded1b Invoke django-admin through python API call rather than on the command line, to sidestep platform-specific issues with finding / launching executables - fixes #625 2014-09-25 00:13:29 +01:00
Dave Cranwell
5f09dd688c removed debugging 2014-09-23 10:27:02 +01:00
Dave Cranwell
70d263ce6e Fixing issue with inline panels used in non-content panels failing to display correctly due to use of :visible, which doesn't work as expected when content is already hidden at runtime 2014-09-23 10:26:15 +01:00
Matt Westcott
31cfabc275 update pypi classifier to Production / Stable 2014-09-22 21:11:22 +01:00
Matt Westcott
6f9065d769 release note for #643 2014-09-22 21:03:45 +01:00
Matt Westcott
616183a360 Merge branch 'kaedroho-feature/template-dj17' 2014-09-22 21:01:17 +01:00
Karl Hobley
4f0c6b9b8b Merge pull request #648 from takeflight/update-taggit
Bump django-taggit version to 0.12.2
2014-09-22 08:52:47 +01:00
Tim Heap
2148da54cb Bump django-taggit version to 0.12.2
0.12.1 did not have all of its migrations applied, which played havoc
with migrations of apps that depended upon django-taggit
2014-09-22 10:33:27 +10:00
Matt Westcott
fe6684ec77 Merge branch 'feature/template-dj17' of https://github.com/kaedroho/wagtail into kaedroho-feature/template-dj17 2014-09-19 17:01:12 +01:00
Dave Cranwell
408d2c6b68 Update 500.html 2014-09-19 16:42:53 +01:00
Dave Cranwell
4458f382e0 Update base.html 2014-09-19 16:42:37 +01:00
Dave Cranwell
a91cd56824 removed shadow till open 2014-09-19 11:06:16 +01:00
Dave Cranwell
5cb033fec6 wrong selector 2014-09-19 11:05:28 +01:00
Dave Cranwell
457c9f2ac1 added back search menu 2014-09-19 11:03:02 +01:00
Dave Cranwell
1eb8d6ee88 tweak 2014-09-19 10:27:54 +01:00
Dave Cranwell
7fb2d196b4 styling for mobile 2014-09-19 10:19:57 +01:00
Dave Cranwell
a5c2a708d5 teal -> salmon 2014-09-18 16:55:17 +01:00
Dave Cranwell
12983c446e merged my previous changes in feature/settings-menu 2014-09-18 16:40:04 +01:00
Dave Cranwell
1ee5987339 merged design branch of settings menu changes 2014-09-18 15:11:24 +01:00
Dave Cranwell
b17ded928c merge master 2014-09-18 15:09:29 +01:00
Dave Cranwell
c5ae725401 Merge branch 'master' into pr/539 2014-09-18 15:03:33 +01:00
Dave Cranwell
2c911c20e3 Update CONTRIBUTORS.rst 2014-09-18 14:49:53 +01:00
Karl Hobley
f50ed21156 Merge pull request #561 from kaedroho/bad-imports-cleanup
Cleaned up bad imports. Fixes #544
2014-09-18 12:38:55 +01:00
Karl Hobley
078d4fadde No need to run syncdb in project template vagrantfile anymore 2014-09-18 10:57:33 +01:00
Karl Hobley
31b8a14b62 Docs update for project template django 1.7 support 2014-09-18 10:57:10 +01:00
Karl Hobley
f56a234e28 Removed south from base settings in project template 2014-09-18 10:56:47 +01:00
Karl Hobley
2574cfad9d Added Django 1.7 support into project template 2014-09-18 10:43:41 +01:00
Karl Hobley
2ffc5828ff Merge remote-tracking branch 'torchbox/master' into bad-imports-cleanup
Conflicts:
	wagtail/wagtailembeds/__init__.py
	wagtail/wagtailsearch/__init__.py
2014-09-18 10:40:32 +01:00
Karl Hobley
1bce98795e Docs for update_index --backend option 2014-09-18 10:37:09 +01:00
Matt Westcott
7c8b1c4adb Merge branch 'master' of github.com:torchbox/wagtail 2014-09-18 09:50:57 +01:00
Matt Westcott
a4cf05f1bc Merge branch 'takeflight-feature/register-snippet-decorator' 2014-09-18 09:49:15 +01:00
Matt Westcott
f11c34e059 release note for #641 2014-09-18 09:49:08 +01:00
Karl Hobley
007b8249e1 Added contributor entry for #639 2014-09-18 09:19:14 +01:00
Karl Hobley
174e9d6de4 Merge pull request #639 from jalourenco/master
wagtail 0.6.0 pt_PT localization
2014-09-18 09:16:11 +01:00
Karl Hobley
60ed50b75b Merge pull request #642 from takeflight/bug/failing-tests-613
Fix failing tests when WAGTAILSEARCH_BACKENDS not filled out
2014-09-18 09:15:05 +01:00
Tim Heap
cb3094a4a7 Fix failing tests when WAGTAILSEARCH_BACKENDS not filled out
The tests attempted to skip themselves when WAGTAILSEARCH_BACKENDS was
not filled out, but the skip code was throwing an error, causing the
test to fail.
2014-09-18 15:46:49 +10:00
Tim Heap
a1d3a32dd6 Make register_snippet usable as a decorator 2014-09-18 15:35:39 +10:00
Jose Lourenco
344df1d414 add 0.6.0 localized files 2014-09-17 17:44:58 +01:00
Dan Braghis
23bbc1bcf9 Fix typo and slight PEP8 cleanup. 2014-09-17 16:17:02 +01:00
Jose Lourenco
f414cf2660 Merge pull request #2 from torchbox/master
Update from  torchbox:master on 2014-09-16;
Wagtail 0.6.0
2014-09-17 16:07:10 +01:00
Tom Dyson
22b32d767e Update installation docs
wagtail start command needs pip install requirements.txt in 0.6
2014-09-17 11:17:02 +01:00
Matt Westcott
354e4930f1 use absolute imports to wagtailadmin SCSS files from wagtailimages 2014-09-16 16:38:36 +01:00
Matt Westcott
abf2173e0d Merge branch 'takeflight-feature/parent_page_types' 2014-09-16 15:49:25 +01:00
Matt Westcott
4ed76af781 release note for #491 2014-09-16 15:47:40 +01:00
Dave Cranwell
04c4e380ba Update README.rst 2014-09-16 15:45:22 +01:00
Matt Westcott
fa558b149d Fix ability to pass a class object in subpage_types / parent_page_types 2014-09-16 15:44:42 +01:00
Matt Westcott
b4097dce1d add unit tests for allowed_subpage_types and allowed_parent_page_types 2014-09-16 15:38:28 +01:00
Karl Hobley
cd3431a57e Fixed some accidentally committed code 2014-09-16 15:29:38 +01:00
Karl Hobley
9e3bec0d5f Don't use crop closeness if it's out of range 2014-09-16 15:27:01 +01:00
Karl Hobley
4757c1633c Make sure the entire focal point is in the crop 2014-09-16 15:10:40 +01:00