e1d4317679
Merge branch 'release/1.4.2'
2015-06-16 01:48:41 -06:00
e1c3f073a7
Merge branch 'feature/include-django-meta' into develop
2015-06-16 01:48:12 -06:00
27a0fc1c59
requirements: added djangocms-page-meta
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:40:41 -06:00
c6e44f702d
settings: added django-meta configuration.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:37:13 -06:00
cec05aff01
Merge branch 'master' of git.ungleich.ch:dynamicweb into feature/include-django-meta
2015-06-16 01:10:35 -06:00
26df9e036a
Merge branch 'master' of git.ungleich.ch:dynamicweb into develop
2015-06-16 01:06:15 -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
9f3ee8a7c8
Merge branch 'release/1.4.1'
2015-06-16 00:31:08 -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
e230ee0ae8
Merge branch 'feature/hostingapp' into develop
2015-06-15 21:25:08 -06:00
51eeeadf18
docs: added requirements
2015-06-15 00:20:55 -06:00
6cb62e8f29
better by requirements
2015-06-14 15:55:18 -06:00
a225be491c
Merge branch 'hotfix/ckeditor-conf' into develop
2015-06-13 22:41:44 -06:00
04ee920211
Merge branch 'hotfix/ckeditor-conf'
2015-06-13 22:41:34 -06:00
717f1a7268
deleted ckeditor settings
2015-06-13 22:41:29 -06:00
2376ffb284
Merge branch 'hotfix/back_blog_to_placeholder' into develop
2015-06-13 22:38:06 -06:00
ccc2e8537d
Merge branch 'hotfix/back_blog_to_placeholder'
2015-06-13 22:37:45 -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
aad3b0ea36
Merge branch 'hotfix/placeholderblog' into develop
2015-06-13 22:22:57 -06:00
4c86433046
Merge branch 'hotfix/placeholderblog'
2015-06-13 22:22:42 -06:00
ed2012cd40
settings: added ckeditor configuration
2015-06-13 22:22:36 -06:00
700f35bf01
.
2015-06-13 22:12:00 -06:00
7fe2314c6e
Merge branch 'release/1.4'
2015-06-13 20:20:58 -06:00
c8a616b7b5
gitginore: added vim cache files.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 20:08:07 -06:00
ed9d13d1e4
Merge branch 'feature/conf-https' into develop
2015-06-13 20:06:26 -06:00
05ffcaf85a
Makefile: changed target and rsync command.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 20:05:57 -06:00
da45722e9a
templates: fixed cdn files to fetch from https
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 16:49:15 -06:00
f5337528e9
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
181ca7cb59
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
fc2d09d9ac
Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop
2015-06-13 12:20:34 -06:00
7083428824
gitignore: static folder
2015-06-13 09:36:03 -06:00
Nico Schottelius
640f99bbed
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
29773e45ab
restore blog.ungleich.ch temporarily
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-12 19:04:18 +02:00
Nico Schottelius
d5e4189f86
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
82da769573
empty static
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-12 17:40:06 +02:00
9ffb4698cd
spec v0.1
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-12 09:39:18 -06:00
dfec8c29fd
Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop
2015-06-10 21:19:47 -06:00
c497ad24d5
changes on readme
2015-06-10 21:18:19 -06:00
Nico Schottelius
83cbebd415
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
da0ece6d63
digital_glarus -> digitalglarus
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:34:33 +02:00
Nico Schottelius
c93b044bf0
remove duplicate django entry
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:28:24 +02:00
Nico Schottelius
71823b12c8
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
46ce08909d
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
fe81faf015
stable_requirements
2015-06-10 09:53:23 -06:00
91f02d5c8e
added {README,DEPLOY}.rst
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:28:10 -06:00
4b912cceab
Makefile, refactor.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:27:10 -06:00
5795d2c193
configs: circus example to match with staging.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:26:56 -06:00
ed4f7f5721
configs: nginx proxy example to match with staging.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 02:26:41 -06:00
ae0ece8f18
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
07a50b8627
requirements: debian, added essential packages.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 00:38:13 -06:00
