mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
6 309 Commity
56 Gałęzie
257 Tagi
3,4 GiB
Wykres commitów

6309 Commity (458d0af5652aa53fb7912981f27081d82e2565d0)

Autor SHA1 Wiadomość Data
Dave Cranwell c1f6dbf8a2 Merge commit 'f8d9b62' into reapply-design-updates-pre-split 2014-02-05 11:56:03 +00:00
Dave Cranwell 5b6dd59f7b merging from ui update branch 2014-02-05 11:55:54 +00:00
Dave Cranwell 4c46779974 Merge commit '3f4cd0c' into reapply-design-updates-pre-split 2014-02-05 11:53:27 +00:00
Dave Cranwell c73d5c6ecc merging from ui update branch 2014-02-05 11:52:57 +00:00
Dave Cranwell 757b90bb52 Merge commit '5792277' into reapply-design-updates-pre-split 2014-02-05 11:31:40 +00:00
Dave Cranwell b34e1981d2 merging from ui update branch 2014-02-05 11:31:31 +00:00
Dave Cranwell 27d7ecaa68 Merge commit '7e06aab' into reapply-design-updates-pre-split 2014-02-05 11:29:55 +00:00
Dave Cranwell 643f9c323d Merge commit 'b0f3a3a' into reapply-design-updates-pre-split 2014-02-05 11:22:39 +00:00
Dave Cranwell 4a39037732 merging from ui update branch 2014-02-05 11:22:31 +00:00
Dave Cranwell d7c51a0dc4 merging from ui update branch 2014-02-05 11:19:34 +00:00
Dave Cranwell 92a513b697 Merge commit 'e976c72' into reapply-design-updates-pre-split 2014-02-05 11:13:09 +00:00
Dave Cranwell 5faefd59a5 Merge commit 'bdd9b8d' into reapply-design-updates-pre-split 2014-02-05 11:12:55 +00:00
Dave Cranwell 91618e2208 Merge commit 'fcb9134' into reapply-design-updates-pre-split 2014-02-05 11:12:18 +00:00
Dave Cranwell 045891ee3d merging from ui update branch 2014-02-05 11:12:08 +00:00
Dave Cranwell 5b9599ee3f merging from ui update branch 2014-02-05 11:10:09 +00:00
Dave Cranwell 557e0364c0 merging from ui update branch 2014-02-05 10:35:46 +00:00
Matt Westcott 939396767c Remove explicit permission definitions on wagtailimage.Image as they clash with the auto-created ones 2014-02-04 13:21:15 +00:00
Karl Hobley 34e5fc0574 Changed name in setup.py to lowercase 2014-02-03 17:26:22 +00:00
Karl Hobley 398238c811 Added setup.py 2014-02-03 17:14:46 +00:00
Matt Westcott 49ddbaae90 merge 002b896e45b48c5ca80c3ed3cb8f4a2f921f8af8 (allow password management to be enabled/disabled by the WAGTAIL_PASSWORD_MANAGEMENT_ENABLED setting). Need to apply manually because git chokes on the lack of submodules on the feature/user-account-settings branch. 2014-02-03 15:15:35 +00:00
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