0
0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-24 19:17:48 +01:00
Commit Graph

11 Commits

Author SHA1 Message Date
Karl Hobley
67a069dbd3 Merge branch 'develop' into feature/user-account-settings
Conflicts:
	django-verdant/verdantadmin/templates/verdantadmin/home.html
	django-verdant/verdantadmin/urls.py
	django-wagtail/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html
2014-01-28 16:03:49 +00:00
Matt Westcott
7f248bdf63 add reverse migration for verdantimages/0002_initial_data 2014-01-28 12:36:50 +00:00
Matt Westcott
b433d5c23a Move verdantimages app to django-wagtail package 2014-01-28 12:32:16 +00:00
Matt Westcott
351e469b12 move verdantusers app to django-wagtail package 2014-01-27 17:09:25 +00:00
Matt Westcott
c400a966ad Move verdantsnippets app into django-wagtail package 2014-01-27 16:57:20 +00:00
Matt Westcott
cba8f851d7 Move verdantdocs app into wagtail 2014-01-27 14:13:47 +00:00
Matt Westcott
77275e510b Move verdantadmin app to django-wagtail package 2014-01-24 17:34:26 +00:00
Matt Westcott
bbd9bee4bb Move wagtailcore templates to the right place 2014-01-24 12:47:21 +00:00
Matt Westcott
0decab0996 Migration fixes so that bringing the site up from scratch works 2014-01-24 12:44:48 +00:00
Matt Westcott
5c69d3ae23 Move 'core' app to the wagtail package 2014-01-24 11:42:11 +00:00
Matt Westcott
679f15811e Add an initially empty django-wagtail package 2014-01-22 12:27:23 +00:00