Commit graph

490 commits

Author SHA1 Message Date
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
004524b7c5 Merge branch 'release/1.4.3' 2015-06-16 02:16:53 -06:00
7b8c5eb555 Merge branch 'release/1.4.3' 2015-06-16 02:16:53 -06:00
753c6c2af0 templates: block meta
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 02:16:16 -06:00
40958404c6 templates: block meta
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 02:16:16 -06:00
d6631bcf25 Merge branch 'release/1.4.2' 2015-06-16 01:48:41 -06:00
e1d4317679 Merge branch 'release/1.4.2' 2015-06-16 01:48:41 -06:00
4ce7ba0198 Merge branch 'feature/include-django-meta' into develop 2015-06-16 01:48:12 -06:00
e1c3f073a7 Merge branch 'feature/include-django-meta' into develop 2015-06-16 01:48:12 -06:00
ca7efc1f71 requirements: added djangocms-page-meta
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:40:41 -06:00
27a0fc1c59 requirements: added djangocms-page-meta
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:40:41 -06:00
9c5dd3c152 settings: added django-meta configuration.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:37:13 -06:00
c6e44f702d settings: added django-meta configuration.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:37:13 -06:00
38a5ffa606 Merge branch 'master' of git.ungleich.ch:dynamicweb into feature/include-django-meta 2015-06-16 01:10:35 -06:00
cec05aff01 Merge branch 'master' of git.ungleich.ch:dynamicweb into feature/include-django-meta 2015-06-16 01:10:35 -06:00
5c2b60b1fc Merge branch 'master' of git.ungleich.ch:dynamicweb into develop 2015-06-16 01:06:15 -06:00
26df9e036a Merge branch 'master' of git.ungleich.ch:dynamicweb into develop 2015-06-16 01:06:15 -06:00
7444c36392 templates: added meta description and block meta.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:05:47 -06:00
a4061c866a templates: added meta description and block meta.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:05:47 -06:00
3f5339129c Merge branch 'release/1.4.1' 2015-06-16 00:31:08 -06:00
9f3ee8a7c8 Merge branch 'release/1.4.1' 2015-06-16 00:31:08 -06:00
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
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
46d3c084e7 Merge branch 'feature/hostingapp' into develop 2015-06-15 21:25:08 -06:00
e230ee0ae8 Merge branch 'feature/hostingapp' into develop 2015-06-15 21:25:08 -06:00
f72b297118 docs: added requirements 2015-06-15 00:20:55 -06:00
51eeeadf18 docs: added requirements 2015-06-15 00:20:55 -06:00
7b2bb05a80 better by requirements 2015-06-14 15:55:18 -06:00
6cb62e8f29 better by requirements 2015-06-14 15:55:18 -06:00
9c1dd92e21 Merge branch 'hotfix/ckeditor-conf' into develop 2015-06-13 22:41:44 -06:00
a225be491c Merge branch 'hotfix/ckeditor-conf' into develop 2015-06-13 22:41:44 -06:00
b710a9810e Merge branch 'hotfix/ckeditor-conf' 2015-06-13 22:41:34 -06:00
04ee920211 Merge branch 'hotfix/ckeditor-conf' 2015-06-13 22:41:34 -06:00
a8efa4ff6a deleted ckeditor settings 2015-06-13 22:41:29 -06:00
717f1a7268 deleted ckeditor settings 2015-06-13 22:41:29 -06:00
1d6d411367 Merge branch 'hotfix/back_blog_to_placeholder' into develop 2015-06-13 22:38:06 -06:00
2376ffb284 Merge branch 'hotfix/back_blog_to_placeholder' into develop 2015-06-13 22:38:06 -06:00