aatish/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
433 commits 11 branches 82 tags 313 MiB
Commit graph

433 commits

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

The content added to the model for the articles
is just a TextField, so we loose every plugin
interaction.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-13 22:35:25 -06:00
rscnt
8e87a27c48 settings: use placeholder for blog post. 
Add a TextFieldPlugin to the blog post
content placeholder by default.

The content added to the model for the articles
is just a TextField, so we loose every plugin
interaction.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-13 22:35:25 -06:00
rscnt
f206861942 Merge branch 'hotfix/placeholderblog' into develop 2015-06-13 22:22:57 -06:00
rscnt
aad3b0ea36 Merge branch 'hotfix/placeholderblog' into develop 2015-06-13 22:22:57 -06:00
rscnt
2c347193e9 Merge branch 'hotfix/placeholderblog' 2015-06-13 22:22:42 -06:00