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
f97720e913
Merge branch 'hotfix/back_blog_to_placeholder'
2015-06-13 22:37:45 -06:00
ccc2e8537d
Merge branch 'hotfix/back_blog_to_placeholder'
2015-06-13 22:37:45 -06:00
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
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
f206861942
Merge branch 'hotfix/placeholderblog' into develop
2015-06-13 22:22:57 -06:00
aad3b0ea36
Merge branch 'hotfix/placeholderblog' into develop
2015-06-13 22:22:57 -06:00
2c347193e9
Merge branch 'hotfix/placeholderblog'
2015-06-13 22:22:42 -06:00
4c86433046
Merge branch 'hotfix/placeholderblog'
2015-06-13 22:22:42 -06:00
aa9158a538
settings: added ckeditor configuration
2015-06-13 22:22:36 -06:00
ed2012cd40
settings: added ckeditor configuration
2015-06-13 22:22:36 -06:00
adb966fc90
.
2015-06-13 22:12:00 -06:00
700f35bf01
.
2015-06-13 22:12:00 -06:00
9170ae68db
Merge branch 'release/1.4'
2015-06-13 20:20:58 -06:00
7fe2314c6e
Merge branch 'release/1.4'
2015-06-13 20:20:58 -06:00
a1c7f47e98
gitginore: added vim cache files.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 20:08:07 -06:00
c8a616b7b5
gitginore: added vim cache files.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 20:08:07 -06:00
db4a84aea4
Merge branch 'feature/conf-https' into develop
2015-06-13 20:06:26 -06:00
ed9d13d1e4
Merge branch 'feature/conf-https' into develop
2015-06-13 20:06:26 -06:00
228ae9c7a8
Makefile: changed target and rsync command.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 20:05:57 -06:00
