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

3002 Commity (250e5d97fb9419780ae2fc5586b46164ec6b2f93)

Autor SHA1 Wiadomość Data
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
Karl Hobley ca7e285353 Added user attribute to Page.copy 
This is used for setting the owner of the new pages and the user for the
new revision that gets created
 2014-12-02 16:30:47 +00:00
Karl Hobley 7235c61fb7 Create new revision when copying pages 
This serves two purposes:
 * It makes sure update_attrs gets applied to the latest revision so the
   changes are reflected in the editor
 * It bumps the last_revision_created_at value so the new page gets
   ordered as if it was just created
 2014-12-02 16:29:02 +00:00
Karl Hobley 107767e97a Update page IDs in revision JSON when copying 
Fixes #837

When copying a page, all of its revisions are also copied. The revisions
are JSON encoded and include ID fields which point back to the original
page object. These IDs weren't being updated when the revision was
copied to a new page causing the editor to break when that new page is
edited.
 2014-12-02 16:29:02 +00:00
Karl Hobley 3f83eb898f Fixes to 0.8.4 release notes 2014-12-02 15:17:34 +00:00
Karl Hobley 46d0d98706 Added changelog/release notes for 0.8.4 2014-12-02 15:14:27 +00:00
Karl Hobley 1fc4302f3a Merge branch 'pr-838' 
Conflicts:
	CHANGELOG.txt
	CONTRIBUTORS.rst
	docs/releases/0.9.rst
 2014-12-02 14:56:49 +00:00
Karl Hobley 9edd3332a2 Added Timo Rieber to contributors 2014-12-02 14:55:04 +00:00
Karl Hobley 13814fba62 Changelog and release note for #838 2014-12-02 14:54:21 +00:00
Karl Hobley c50b79f8ee Added another test for #838 
This tests that the page is copied to the different parent when a
different parent is selected.
 2014-12-02 14:50:29 +00:00
Matt Westcott 7d66cd6a60 Merge branch 'master' of github.com:torchbox/wagtail 2014-12-02 12:49:37 +00:00
Matt Westcott 0a98c9eb10 Merge branch 'takeflight-feature/migration-tests' 2014-12-02 12:49:19 +00:00
Matt Westcott 645621ef02 reorganise migrations to remove duplicate, and add migration for RegisterFunction which was previously masked due to duplicate test name 2014-12-02 12:47:16 +00:00
Dave Cranwell 74915c4cca Help develp me link included closed items 2014-12-02 11:52:02 +00:00
Matt Westcott 3535b5ca21 Merge branch 'feature/migration-tests' of https://github.com/takeflight/wagtail into takeflight-feature/migration-tests 
Conflicts:
	wagtail/wagtailsnippets/tests.py
 2014-12-02 11:45:29 +00:00
Karl Hobley 0e61e9a0c4 Updated deprecation warnings 2014-12-02 09:27:46 +00:00
Karl Hobley 2049f0ed1a Update 0.9.rst 2014-12-02 09:22:52 +00:00