Wykres commitów

2182 Commity (f0db8082c830a7c075390996bb53fe4f5151cac5)

Autor SHA1 Wiadomość Data
Karl Hobley b7901aa026 Fixed test failure 2014-07-28 15:52:42 +01:00
Karl Hobley 0e2b621d39 Added Django 1.7 support into Elasticsearch query building 2014-07-28 15:52:42 +01:00
Karl Hobley 78643d40cd Created initial data migrations 2014-07-28 15:52:42 +01:00
Karl Hobley 3c64287488 Created initial Django 1.7 migrations 2014-07-28 15:52:42 +01:00
Karl Hobley c5044eb0e5 Moved get_upload_to outside of Image model 2014-07-28 15:52:42 +01:00
Karl Hobley fa75a11c61 Removed 'FakePage' from admin tests (upsets migrations) 2014-07-28 15:52:42 +01:00
Karl Hobley 6d50ae5d65 Only enable south in tests if were testing with Django 1.6 2014-07-28 15:52:42 +01:00
Matt Westcott b48089c88c Merge branch 'kaedroho-test-with-custom-user-model' 2014-07-28 13:12:50 +01:00
Matt Westcott b7d16f51f4 remove newly-added references to User in test_account_management 2014-07-28 13:12:28 +01:00
Matt Westcott 0f92ccb972 Merge branch 'test-with-custom-user-model' of https://github.com/kaedroho/wagtail into kaedroho-test-with-custom-user-model
Conflicts:
	runtests.py
	wagtail/tests/utils.py
2014-07-28 13:08:23 +01:00
Matt Westcott e6b45af2b1 Merge branch 'takeflight-feature/test-db-settings' 2014-07-28 12:07:49 +01:00
Matt Westcott 1d0c01e5fa Merge branch 'feature/test-db-settings' of https://github.com/takeflight/wagtail into takeflight-feature/test-db-settings
Conflicts:
	runtests.py
2014-07-28 12:07:34 +01:00
Matt Westcott 560c97a9ed Merge pull request #430 from kaedroho/south-1.0
Use South 1.0 migration directory
2014-07-28 08:40:37 +02:00
Matt Westcott bcbaa4c86b Merge pull request #498 from kaedroho/deprecation_warnings
Versioned deprecation warnings
2014-07-28 08:32:38 +02:00
Karl Hobley fe74aa1d00 Removed Advanced topics 2014-07-25 15:57:42 +01:00
Karl Hobley 833cfec501 Moved 'settings.rst' into howto 2014-07-25 15:57:06 +01:00
Karl Hobley fc4b1ba177 Removed 'Overview' title from Pages index (was messing up toctree) 2014-07-25 15:41:20 +01:00
Karl Hobley 30cb0b2aae Moved some docs into contrib components 2014-07-25 15:38:53 +01:00
Karl Hobley 90cec360ff Moved roadmap into releases section 2014-07-25 15:35:15 +01:00
Karl Hobley 2b9249907b Added reference section 2014-07-25 15:33:41 +01:00
Karl Hobley b7862a91d0 Added howto section 2014-07-25 15:32:35 +01:00
Karl Hobley d9e0ad3a37 Added components sections 2014-07-25 15:31:55 +01:00
Tom Talbot 6232e27029 Merge branch 'master' into 146-display-calculated-usage
Conflicts:
	wagtail/wagtailimages/tests.py
2014-07-25 14:41:26 +01:00
Dave Cranwell cd39f305a5 fixing search in page chooser, which would allow selection of any page even if the developer has chosen to restrict to only certain types allowed. 2014-07-25 14:36:38 +01:00
Tom Talbot 2acbf3e9e0 Use wagtailadmin/shared/pagination_nav.html on usage pages 2014-07-25 14:04:58 +01:00
Dave Cranwell 2399d2fc65 correcting position of explorer spinner 2014-07-25 10:39:59 +01:00
Dave Cranwell 9e5a9eeb1e preventing highlighting of th 2014-07-24 15:54:06 +01:00
Karl Hobley 98fb3ca29b Merge remote-tracking branch 'torchbox/master' into image-smartcropping 2014-07-24 15:45:08 +01:00
Dave Cranwell d30dce16f4 changed help blocks to solid colour to avoid 'sea of strokes' 2014-07-24 15:35:48 +01:00
Dave Cranwell 48d292be8f styled editors picks help appropriately 2014-07-24 15:32:58 +01:00
Dave Cranwell 7962696e65 listing arrows always highlighted on hover now 2014-07-24 15:25:54 +01:00
Dave Cranwell 0a5077ace7 font size minor adjustments 2014-07-24 15:23:05 +01:00
Dave Cranwell 0ed53ccd9b explorer->explore 2014-07-24 15:13:26 +01:00
Dave Cranwell cbc96ac97e tweaks to listing styles 2014-07-24 15:11:45 +01:00
Karl Hobley 4904cbe030 Updated import in multiple image upload views 2014-07-24 14:51:12 +01:00
Karl Hobley 9b627b241d Merge remote-tracking branch 'torchbox/master' into image-frontend-urls
Conflicts:
	wagtail/wagtailimages/tests.py
	wagtail/wagtailimages/urls.py
	wagtail/wagtailimages/utils.py
2014-07-24 14:45:19 +01:00
Karl Hobley 92a433832f Merge remote-tracking branch 'torchbox/master' into image-smartcropping
Conflicts:
	wagtail/wagtailimages/tests.py
2014-07-24 14:33:50 +01:00
Dave Cranwell 09097f651e listings of pages now better reflect when a page can be chosen 2014-07-24 13:28:10 +01:00
Dave Cranwell 7547e01661 compressing multi-upload files 2014-07-24 12:47:31 +01:00
Karl Hobley 118c3b0f33 Changelog/release notes for multiple image uploader 2014-07-24 12:33:47 +01:00
Karl Hobley 14fdc00de9 Merge pull request #428 from torchbox/feature/multi-image-upload
Multi Image Upload
2014-07-24 12:31:41 +01:00
Dave Cranwell 531a5b4703 Merge remote-tracking branch 'upstream/master' 2014-07-24 11:40:26 +01:00
Dave Cranwell 5bd3ebc9d0 added pagination to styleguide 2014-07-24 11:40:01 +01:00
Matt Westcott f723e80520 Merge branch 'master' of github.com:torchbox/wagtail 2014-07-24 11:34:16 +01:00
Matt Westcott e89505de1f changelog / release notes for #500 2014-07-24 11:33:58 +01:00
Matt Westcott 6099f8c5a3 Merge branch 'kaedroho-issue/197' 2014-07-24 11:29:31 +01:00
Karl Hobley 77673d7bf8 Replaced all DeprecationWarnngs with RemovedInWagtail06Warnings 2014-07-24 11:26:43 +01:00
Dave Cranwell 0dbf00964d removed misleading greyed-out tick in checkboxes 2014-07-24 11:19:13 +01:00
Karl Hobley e857b630c8 Workaround a bug with django-modelcluster not committing m2m fields on form save. Fixes #192 2014-07-24 11:03:08 +01:00
Karl Hobley 1c146648e1 Added failing test for #197 2014-07-24 09:35:08 +01:00