Karl Hobley
|
ada7961207
|
Merge branch 'ldap-changes' into staging
Conflicts:
django-verdant/rca/static/rca/js/filters.js
|
2014-01-31 16:03:38 +00:00 |
|
Matt Westcott
|
561835114f
|
Merge branch 'wagtail-separation' into develop
|
2014-01-30 14:33:10 +00:00 |
|
Matt Westcott
|
737e47d8eb
|
Merge branch 'wagtail-separation' into staging
|
2014-01-30 14:31:21 +00:00 |
|
Matt Westcott
|
3e52ae542b
|
rename django-cluster to django-modelcluster
|
2014-01-30 14:30:32 +00:00 |
|
Matt Westcott
|
3d34be6c9f
|
Merge branch 'wagtail-separation' into develop
|
2014-01-30 11:56:04 +00:00 |
|
Matt Westcott
|
e1f39dd508
|
Merge branch 'wagtail-separation' into staging
|
2014-01-30 11:31:04 +00:00 |
|
Matt Westcott
|
1a7001c8b2
|
change default value of WAGTAILSEARCH_ES_INDEX from verdant to wagtail (and keep the name 'verdant' for RCA's instance)
|
2014-01-30 11:30:21 +00:00 |
|
Matt Westcott
|
eb354a1147
|
rename VERDANT_SITE_NAME to WAGTAIL_SITE_NAME (and remove todo note - there's no way to pass in a name that's particularly better than the settings file)
|
2014-01-30 11:27:06 +00:00 |
|
Matt Westcott
|
60b7cd2411
|
rename verdantuserbar to wagtailuserbar
|
2014-01-30 11:24:24 +00:00 |
|
Matt Westcott
|
4c290522e5
|
change verdant_preview_* window names to wagtail_preview_
|
2014-01-30 10:52:32 +00:00 |
|
Matt Westcott
|
b49bf4306d
|
VERDANTADMIN_NOTIFICATION_FROM_EMAIL -> WAGTAILADMIN_NOTIFICATION_FROM_EMAIL
|
2014-01-30 10:51:10 +00:00 |
|
Matt Westcott
|
72cc52c227
|
rename verdant_site_root_paths to wagtail_site_root_paths
|
2014-01-30 10:49:17 +00:00 |
|
Matt Westcott
|
1be6e3bddf
|
Verdant -> Wagtail on initial page title
|
2014-01-30 10:48:32 +00:00 |
|
Matt Westcott
|
f364e2be04
|
rename X-Verdant-Preview HTTP header to X-Wagtail-Preview
|
2014-01-30 10:47:33 +00:00 |
|
Matt Westcott
|
bdf130541d
|
Rename hallo.js plugins from verdant to wagtail
|
2014-01-30 10:45:44 +00:00 |
|
Matt Westcott
|
77ec180efc
|
rename verdant_hooks modules to wagtail_hooks
|
2014-01-30 09:56:59 +00:00 |
|
Matt Westcott
|
192a05d15f
|
rename VerdantAdminModelForm* to WagtailAdminModelForm
|
2014-01-30 09:55:15 +00:00 |
|
Matt Westcott
|
df9242e35b
|
Merge branch 'wagtail-separation' into develop
|
2014-01-29 16:50:05 +00:00 |
|
Matt Westcott
|
94c6c2defb
|
Merge branch 'wagtail-separation' into staging
|
2014-01-29 16:26:20 +00:00 |
|
Matt Westcott
|
70e91d6759
|
Move verdantsearch app to wagtail package
|
2014-01-29 16:24:09 +00:00 |
|
Karl Hobley
|
0152b36032
|
Added prefetch_related for pages on redirects index
|
2014-01-29 15:15:49 +00:00 |
|
Matt Westcott
|
058d8632fb
|
Merge branch 'wagtail-separation' into develop
|
2014-01-29 14:59:14 +00:00 |
|
Matt Westcott
|
fbdcab4f87
|
Merge branch 'wagtail-separation' into staging
|
2014-01-29 14:53:26 +00:00 |
|
Matt Westcott
|
4cc25cee37
|
Move verdantredirects to the django-wagtail app
|
2014-01-29 14:53:09 +00:00 |
|
Matt Westcott
|
c2ac0106a7
|
Merge branch 'wagtail-separation' into staging
|
2014-01-28 17:24:22 +00:00 |
|
Matt Westcott
|
3a4ee42212
|
Merge branch 'wagtail-separation' into develop
|
2014-01-28 17:04:21 +00:00 |
|
Matt Westcott
|
2f1663157e
|
Move verdantembeds to the django-wagtail package
|
2014-01-28 17:03:17 +00:00 |
|
Karl Hobley
|
30dea1ca1b
|
Fixed some old references to verdant
|
2014-01-28 16:10:33 +00:00 |
|
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 |
|