Wykres commitów

2143 Commity (3a1099e33080e42e7f4f17e9c91b9576ff912627)

Autor SHA1 Wiadomość Data
Karl Hobley 32378135bb Moved focal point fields migration into south_migrations 2014-07-29 13:07:19 +01:00
Karl Hobley d6dd8d53b6 Merge branch 'master' into image-smartcropping 2014-07-29 13:06:25 +01:00
Tom Dyson ce71b7d010 Merge pull request #511 from kaedroho/docs_restructure
Docs restructure
2014-07-29 12:23:24 +01:00
Karl Hobley 44ef57a6f0 Removed focal_point parameter from get_rendition 2014-07-29 10:07:14 +01:00
Karl Hobley 3d0bd3dfbd Implemented 'image_data_as_rgb' on Wand backend 2014-07-29 10:06:11 +01:00
Karl Hobley 9501662ead Updated tests migrations 2014-07-28 16:37:46 +01:00
Karl Hobley 43ebd845b6 Added Django 1.7 to tox settings. Use tox on travis 2014-07-28 15:52:42 +01:00
Karl Hobley 8423c557be Added AppConfig classes for all modules 2014-07-28 15:52:42 +01:00
Tom Talbot 10217a9e18 Fixed broken edit handlers test 2014-07-28 15:52:42 +01:00
Karl Hobley 2617174692 Don't ignore DeprecationWarnings
This was previously done for us in Django 1.6. But they reverted back to the default Python configuration to ignore these warnings causing a test to break

0c6a339952
2014-07-28 15:52:42 +01:00
Karl Hobley a7afdd52aa Catch LookupError when finding target model in PageChooserPanel 2014-07-28 15:52:42 +01:00
Karl Hobley d817396e2b Allow Django 1.7 to be installed in setup.py 2014-07-28 15:52:42 +01:00
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
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