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

531 Commity (92563ff53532eb9480139fdc95186085246e22ba)

Autor SHA1 Wiadomość Data
Dave Cranwell a5a20c2d8e mobile menu now better 2014-02-05 16:15:39 +00:00
Dave Cranwell ba7b516f9b use of svg logo instead of font 2014-02-05 15:24:54 +00:00
Dave Cranwell 33068abf00 font updates and further references to verdant removed 2014-02-05 15:14:00 +00:00
Dave Cranwell 7d67a7bac5 gs 2014-02-05 13:45:36 +00:00
Matt Westcott 758a8dadce Merge branch 'feature/taavi-design-updates' of github.com:torchbox/wagtail into feature/taavi-design-updates 2014-02-05 13:28:39 +00:00
Dave Cranwell 25819c4ca4 tweaks to img paths 2014-02-05 12:56:46 +00:00
Dave Cranwell 69d9690694 removal of orphaned merge files. tidying final references to verdant name 2014-02-05 12:49:18 +00:00
Dave Cranwell f9c9dac30a Merge commit 'f653a19' into reapply-design-updates-pre-split 2014-02-05 12:38:53 +00:00
Dave Cranwell deea0075ca merging from ui update branch 2014-02-05 12:38:42 +00:00
Dave Cranwell 8359d3fea2 merging from ui update branch 2014-02-05 12:35:39 +00:00
Dave Cranwell 864e2a9ac1 merging from ui update branch 2014-02-05 12:31:38 +00:00
Dave Cranwell 6fb3159074 merging from ui update branch 2014-02-05 12:29:13 +00:00
Dave Cranwell 7e3894e124 Merge commit '49fd3da' into reapply-design-updates-pre-split 2014-02-05 12:26:32 +00:00
Dave Cranwell 3c091bafde merging from ui update branch 2014-02-05 12:26:15 +00:00
Dave Cranwell 26eaf6e89f Merge commit '64d1d6b' into reapply-design-updates-pre-split 2014-02-05 12:19:33 +00:00
Dave Cranwell 46840b2c2f merging from ui update branch 2014-02-05 12:19:20 +00:00
Dave Cranwell 04953427c8 merging from ui update branch 2014-02-05 12:14:14 +00:00
Dave Cranwell ed7535c4fd merging from ui update branch 2014-02-05 12:10:41 +00:00
Dave Cranwell 3873b62e6f Merge commit '7cdbed3' into reapply-design-updates-pre-split 2014-02-05 12:05:26 +00:00
Dave Cranwell 00976ab025 Merge commit '753c413' into reapply-design-updates-pre-split 2014-02-05 12:05:03 +00:00
Dave Cranwell 8628cad394 merging from ui update branch 2014-02-05 12:04:24 +00:00
Dave Cranwell 12c795f4b3 merging from ui update branch 2014-02-05 11:59:07 +00:00
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