Commit Graph

492 Commits

Author SHA1 Message Date
상희 김 25f950c58e Merge branch 'feature/djangohosting' of git.ungleich.ch:dynamicweb into feature/djangohosting 2015-08-09 17:53:49 +02:00
상희 김 7514628187 django hosting card image 2015-08-09 17:53:45 +02:00
Nico Schottelius 3869fab391 Quickfix: add vanity domains to allowed_hosts
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-01 01:05:19 +02:00
Nico Schottelius a665472c32 Quickfix: add vanity domains to allowed_hosts
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-01 01:05:19 +02:00
Nico Schottelius 54387c05d8 Begin to refactor / cleanup hostings
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-30 19:07:29 +02:00
Nico Schottelius 8dd328fcc7 Merge branch 'feature/djangohosting' into develop 2015-07-30 01:14:39 +02:00
Nico Schottelius c72fef6714 Use rails page for rails
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-30 01:09:23 +02:00
Nico Schottelius c228b371d3 Use rails page for rails
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-30 01:09:23 +02:00
상희 김 76a84e43c8 base template created 2015-07-30 00:11:17 +02:00
상희 김 95e354bf0d base template created 2015-07-30 00:11:17 +02:00
Nico Schottelius 5666821682 add route for djangohosting
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-28 21:22:06 +02:00
Nico Schottelius b2c120fd9e add route for djangohosting
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-28 21:22:06 +02:00
상희 김 f311cbc059 django.html added 2015-07-28 21:01:59 +02:00
상희 김 395c2851ed django.html added 2015-07-28 21:01:59 +02:00
Nico Schottelius 7016c05942 digital.glarus -> Digital Glarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-20 22:58:49 +02:00
Nico Schottelius ed9cee2fea digital.glarus -> Digital Glarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-20 22:58:49 +02:00
rascencio 004524b7c5 Merge branch 'release/1.4.3' 2015-06-16 02:16:53 -06:00
rascencio 7b8c5eb555 Merge branch 'release/1.4.3' 2015-06-16 02:16:53 -06:00
rascencio 753c6c2af0 templates: block meta
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 02:16:16 -06:00
rascencio 40958404c6 templates: block meta
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 02:16:16 -06:00
rascencio d6631bcf25 Merge branch 'release/1.4.2' 2015-06-16 01:48:41 -06:00
rascencio e1d4317679 Merge branch 'release/1.4.2' 2015-06-16 01:48:41 -06:00
rascencio 4ce7ba0198 Merge branch 'feature/include-django-meta' into develop 2015-06-16 01:48:12 -06:00
rascencio e1c3f073a7 Merge branch 'feature/include-django-meta' into develop 2015-06-16 01:48:12 -06:00
rascencio ca7efc1f71 requirements: added djangocms-page-meta
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:40:41 -06:00
rascencio 27a0fc1c59 requirements: added djangocms-page-meta
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:40:41 -06:00
rascencio 9c5dd3c152 settings: added django-meta configuration.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:37:13 -06:00
rascencio c6e44f702d settings: added django-meta configuration.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:37:13 -06:00
rascencio 38a5ffa606 Merge branch 'master' of git.ungleich.ch:dynamicweb into feature/include-django-meta 2015-06-16 01:10:35 -06:00
rascencio cec05aff01 Merge branch 'master' of git.ungleich.ch:dynamicweb into feature/include-django-meta 2015-06-16 01:10:35 -06:00
rascencio 5c2b60b1fc Merge branch 'master' of git.ungleich.ch:dynamicweb into develop 2015-06-16 01:06:15 -06:00
rascencio 26df9e036a Merge branch 'master' of git.ungleich.ch:dynamicweb into develop 2015-06-16 01:06:15 -06:00
rascencio 7444c36392 templates: added meta description and block meta.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:05:47 -06:00
rascencio a4061c866a templates: added meta description and block meta.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:05:47 -06:00
rascencio 3f5339129c Merge branch 'release/1.4.1' 2015-06-16 00:31:08 -06:00
rascencio 9f3ee8a7c8 Merge branch 'release/1.4.1' 2015-06-16 00:31:08 -06:00
rascencio d335c2bd57 templates: Added blog article title to <title>
Closes #1628.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 00:25:21 -06:00
rascencio 85e452490e templates: Added blog article title to <title>
Closes #1628.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 00:25:21 -06:00
rascencio 46d3c084e7 Merge branch 'feature/hostingapp' into develop 2015-06-15 21:25:08 -06:00
rascencio e230ee0ae8 Merge branch 'feature/hostingapp' into develop 2015-06-15 21:25:08 -06:00
rascencio f72b297118 docs: added requirements 2015-06-15 00:20:55 -06:00
rascencio 51eeeadf18 docs: added requirements 2015-06-15 00:20:55 -06:00
rascencio 7b2bb05a80 better by requirements 2015-06-14 15:55:18 -06:00
rascencio 6cb62e8f29 better by requirements 2015-06-14 15:55:18 -06:00
rascencio 9c1dd92e21 Merge branch 'hotfix/ckeditor-conf' into develop 2015-06-13 22:41:44 -06:00
rascencio a225be491c Merge branch 'hotfix/ckeditor-conf' into develop 2015-06-13 22:41:44 -06:00
rascencio b710a9810e Merge branch 'hotfix/ckeditor-conf' 2015-06-13 22:41:34 -06:00
rascencio 04ee920211 Merge branch 'hotfix/ckeditor-conf' 2015-06-13 22:41:34 -06:00
rascencio a8efa4ff6a deleted ckeditor settings 2015-06-13 22:41:29 -06:00
rascencio 717f1a7268 deleted ckeditor settings 2015-06-13 22:41:29 -06:00