d6631bcf25
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
ca7efc1f71
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
38a5ffa606
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
7444c36392
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
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
46d3c084e7
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
7b2bb05a80
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
b710a9810e
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
1d6d411367
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
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
f206861942
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
aa9158a538
settings: added ckeditor configuration
2015-06-13 22:22:36 -06:00
adb966fc90
.
2015-06-13 22:12:00 -06:00
9170ae68db
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
db4a84aea4
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
b214a1d6dc
templates: fixed cdn files to fetch from https
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 16:49:15 -06:00
a1085cae75
templates: problem with modals size.
...
see: https://github.com/divio/django-cms/issues/3465
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 13:59:37 -06:00
d6acb6a9e1
settings: bootstrap3 and djangocms-blog
...
+ Now BLOG_USE_PLACEHOLDER is False, this should
give us a HTML Text field for the article body.
+ The URLs for the bootstrap and jquery cnd location
changed, now there should not be problem fetching them
over https
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 13:47:45 -06:00
a01c171b17
Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop
2015-06-13 12:20:34 -06:00
9c07c4c39a
gitignore: static folder
2015-06-13 09:36:03 -06:00
Nico Schottelius
b619a2b57a
mount djangocms on / again - found working nginx config
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-12 21:45:33 +02:00
Nico Schottelius
b49e60378a
restore blog.ungleich.ch temporarily
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-12 19:04:18 +02:00
Nico Schottelius
002fc42a46
do not add files below static/ to git
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-12 17:40:54 +02:00
Nico Schottelius
587c08e0ab
empty static
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-12 17:40:06 +02:00
9cf8bcd7f3
spec v0.1
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-12 09:39:18 -06:00
207fc31417
Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop
2015-06-10 21:19:47 -06:00
ed91919dbe
changes on readme
2015-06-10 21:18:19 -06:00
Nico Schottelius
9593ae5ff6
use django-select2-py3 from github
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:37:39 +02:00
Nico Schottelius
cd234c4dda
digital_glarus -> digitalglarus
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:34:33 +02:00
Nico Schottelius
242219d275
remove duplicate django entry
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:28:24 +02:00
Nico Schottelius
8aacdd53e9
move djangocms-text-ckeditor to 2.5.2 to work with migrations
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:13:12 +02:00
Nico Schottelius
a26a2ec105
mount cms below cms - easier for nginx mapping
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 21:16:08 +02:00
dcb97295f0
stable_requirements
2015-06-10 09:53:23 -06:00
7066e190e8
added {README,DEPLOY}.rst
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:28:10 -06:00
ef9849c56f
Makefile, refactor.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:27:10 -06:00
9ed29bcdb4
configs: circus example to match with staging.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:26:56 -06:00
2915d7f81e
configs: nginx proxy example to match with staging.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:26:41 -06:00
b138526c8f
settings: the migration module for django_cms_text_ckeditor changed.
...
It would be better to use an stable.requirements.txt
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 01:49:48 -06:00
376f637ec7
requirements: debian, added essential packages.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 00:38:13 -06:00
