Wykres commitów

3018 Commity (af8fee8efa5a2eddb969ff8b077ba3a263d02d41)

Autor SHA1 Wiadomość Data
Matt Westcott af8fee8efa Merge branch 'kaedroho-remove-dj16' 2015-01-06 11:24:27 +00:00
Matt Westcott 598d3f8b7f Merge branch 'remove-dj16' of https://github.com/kaedroho/wagtail into kaedroho-remove-dj16 2015-01-06 11:17:56 +00:00
Karl Hobley 15228b11aa Removed Django 1.6 support from test settings 2015-01-02 17:27:59 +00:00
Karl Hobley bbf606926c Removed Django 1.6 support from test_migrations 2015-01-02 17:27:59 +00:00
Karl Hobley 47713c128c Removed Django 1.6 support from utils/apps.py 2015-01-02 17:27:59 +00:00
Karl Hobley 6c8981792e Removed Django 1.6 support from search query 2015-01-02 17:27:59 +00:00
Karl Hobley 04c56ea49b Cleaned up backend loading code 2015-01-02 17:27:59 +00:00
Karl Hobley 4e8a6b309f Always use Pythons builtin unittest module
As we've dropped Python 2.6, the builtin unittest module will always be
unittest2
2015-01-02 17:27:59 +00:00
Karl Hobley 1fa9ab35c0 Deleted south migrations 2015-01-02 17:27:59 +00:00
Karl Hobley b9ce897441 Removed support for Django 1.6 and Python 2.6 2015-01-02 17:27:54 +00:00
Karl Hobley db942132cc Merge pull request #886 from kaedroho/image-edit-form-change
get_image_form now takes model parameter
2015-01-02 13:03:47 +00:00
Karl Hobley 5e905fe7e7 Travis: Install Django 1.7 from PIP 2014-12-23 13:41:50 +00:00
Karl Hobley 2904050af5 get_image_form now takes model parameter
This makes creating projects with multiple image models easier
2014-12-23 12:16:44 +00:00
Karl Hobley 0ffaa5c271 Merge pull request #877 from jalourenco/master
uwsgi_params url update on install scripts debian.sh and ubuntu.sh
2014-12-17 09:10:12 +00:00
Jose Lourenco 98aa7eff97 uwsgi_params url update on install scripts debian.sh and ubuntu.sh 2014-12-17 02:02:40 +00:00
Matt Westcott f2d90844c7 release note for #869 2014-12-16 16:59:46 +00:00
Matt Westcott 250e5d97fb Conflicts:
docs/releases/index.rst
2014-12-16 16:50:09 +00:00
Matt Westcott 6664b063cc release note for #872
Conflicts:
	CONTRIBUTORS.rst
2014-12-16 16:43:55 +00:00
Robert Rollins 9f97e32960 add_subpage view now sorts content types by their verbose names. 2014-12-16 16:42:43 +00:00
Matt Westcott 8e3c9e9721 Merge branch 'coredumperror-mysql_migration' 2014-12-16 16:18:19 +00:00
Matt Westcott d0efd742ff Merge branch 'mysql_migration' of https://github.com/coredumperror/wagtail into coredumperror-mysql_migration 2014-12-16 16:13:04 +00:00
Robert Rollins 0de0bf2cd4 Added MySQL support to 0004_auto__chg_field_rendition_focal_point_key 2014-12-15 12:15:02 -08:00
Dave Cranwell 0d6212b61e Merge pull request #869 from timorieber/fix-admin-submenu
Fixed admin submenus not working correctly when more than one registered
2014-12-15 16:40:40 +00:00
Timo Rieber 674ee79f0d Exclude clicked item itself if already active 2014-12-11 16:32:49 +01:00
Timo Rieber c6f126c8d2 Fixed admin submenus not working correctly when more than one registered 2014-12-11 16:32:49 +01:00
Karl Hobley 0dd0044dc8 Merge pull request #868 from kaedroho/issuu-oembed-provider
Added ISSUU oembed provider
2014-12-11 10:25:17 +00:00
Karl Hobley baf2454d6c Added ISSUU oembed provider
http://developers.issuu.com/api/oembed.html
2014-12-11 10:10:17 +00:00
Karl Hobley a7946ddd71 Merge pull request #864 from coredumperror/pullrequests
Bugfixes for Model recipe docs
2014-12-10 09:11:54 +00:00
Robert Rollins 3eb640495d Bugfixes for Model recipe docs 2014-12-09 17:12:28 -08:00
Matt Westcott d8ac5bf839 copy 0.8.4 doc updates into master 2014-12-04 15:46:28 +00:00
Karl Hobley 6aa4f9c995 Update 0.8.4.rst 2014-12-04 15:43:15 +00:00
Karl Hobley 7d8e4b1e47 Bump version to 0.9.dev0 2014-12-04 15:36:13 +00:00
Matt Westcott 1a37db2ef7 Document the necessary fix to custom image migrations - fixes #832 2014-12-04 13:18:19 +00:00
Karl Hobley 1637c7ba33 Spacing consistency in CHANGELOG.txt 2014-12-03 17:15:54 +00:00
Karl Hobley 3511ce23ee Release note for #844 2014-12-03 14:20:25 +00:00
Matt Westcott bf19446cbd TEST_NAME must differ from database name 2014-12-03 14:18:04 +00:00
Matt Westcott a8eacc2f22 Specify TEST_NAME in test settings to make concurrency tests work on sqlite.
Django 1.6 checks for this setting and defaults to None, which creates an in-memory database
when using sqlite. This causes our race condition test in wagtailimages to fail, since it's
not possible for multiple threads to share the same in-memory database.
2014-12-03 14:18:04 +00:00
Matt Westcott e977ae5aec use Python3 compatible syntax for 'except' 2014-12-03 14:18:04 +00:00
Matt Westcott 0db38791ae accommodate custom user models in migration 2014-12-03 14:18:04 +00:00
Matt Westcott b73f4eb8a0 Add unique constraint to filter spec so that Filter.get_or_create avoids race condition as intended - fixes #312 2014-12-03 14:18:03 +00:00
Matt Westcott 8e7015b9c7 Add failing test for race condition in Filter.get_or_create 2014-12-03 14:18:03 +00:00
Matt Westcott f39a95ab4f Release notes for #842 2014-12-03 13:53:51 +00:00
Matt Westcott f606df9012 Merge branch 'master' of github.com:torchbox/wagtail 2014-12-03 13:19:10 +00:00
Matt Westcott 23fd73486a Merge branch 'kaedroho-issue/837' 2014-12-03 13:18:54 +00:00
Matt Westcott 44ab7589ae Merge branch 'issue/837' of https://github.com/kaedroho/wagtail into kaedroho-issue/837 2014-12-03 13:16:07 +00:00
Matt Westcott 631bec3395 Merge pull request #845 from kaedroho/unpinned-requirements
Unpinned some requirements
2014-12-03 09:46:32 +00:00
Karl Hobley c4e58a7ca5 Unpinned some requirements
To make requires.io happy
2014-12-03 09:25:37 +00:00
Karl Hobley 52581222e8 Changed test to use eventmoderator user 2014-12-02 17:14:22 +00:00
Karl Hobley 13e5221746 Update 0.9.rst 2014-12-02 16:52:41 +00:00
Karl Hobley 1fcb94c0b9 Order by created_at when getting first revision 2014-12-02 16:30:48 +00:00