ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity
470 commits 13 branches 148 tags 315 MiB
Commit graph

470 commits

This branch
This branch
All branches
Author SHA1 Message Date
rscnt
b214a1d6dc templates: fixed cdn files to fetch from https 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-13 16:49:15 -06:00
rscnt
da45722e9a templates: fixed cdn files to fetch from https 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-13 16:49:15 -06:00
rscnt
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
rscnt
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
rscnt
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
rscnt
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
rscnt
a01c171b17 Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop 2015-06-13 12:20:34 -06:00
rscnt
fc2d09d9ac Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop 2015-06-13 12:20:34 -06:00
rscnt
9c07c4c39a gitignore: static folder 2015-06-13 09:36:03 -06:00
rscnt
7083428824 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
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
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
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
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
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
587c08e0ab empty static 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-06-12 17:40:06 +02:00
Nico Schottelius
82da769573 empty static 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-06-12 17:40:06 +02:00
rscnt
9cf8bcd7f3 spec v0.1 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-12 09:39:18 -06:00
rscnt
9ffb4698cd spec v0.1 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-12 09:39:18 -06:00
rscnt
207fc31417 Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop 2015-06-10 21:19:47 -06:00
rscnt
dfec8c29fd Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop 2015-06-10 21:19:47 -06:00
rscnt
ed91919dbe changes on readme 2015-06-10 21:18:19 -06:00
rscnt
c497ad24d5 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
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
cd234c4dda digital_glarus -> digitalglarus 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-06-10 23:34:33 +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
242219d275 remove duplicate django entry 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-06-10 23:28:24 +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
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
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
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
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
rscnt
dcb97295f0 stable_requirements 2015-06-10 09:53:23 -06:00
rscnt
fe81faf015 stable_requirements 2015-06-10 09:53:23 -06:00
rscnt
7066e190e8 added {README,DEPLOY}.rst 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-09 02:28:10 -06:00
rscnt
91f02d5c8e added {README,DEPLOY}.rst 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-09 02:28:10 -06:00
rscnt
ef9849c56f Makefile, refactor. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-09 02:27:10 -06:00
rscnt
4b912cceab Makefile, refactor. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-09 02:27:10 -06:00
rscnt
9ed29bcdb4 configs: circus example to match with staging. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-09 02:26:56 -06:00
rscnt
5795d2c193 configs: circus example to match with staging. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-09 02:26:56 -06:00
rscnt
2915d7f81e configs: nginx proxy example to match with staging. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-09 02:26:41 -06:00
rscnt
ed4f7f5721 configs: nginx proxy example to match with staging. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-09 02:26:41 -06:00
rscnt
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
rscnt
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
rscnt
376f637ec7 requirements: debian, added essential packages. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-09 00:38:13 -06:00
rscnt
07a50b8627 requirements: debian, added essential packages. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-09 00:38:13 -06:00
rscnt
ab643fb3f6 requirements: debian, added git. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-09 00:30:37 -06:00
rscnt
b173facd67 requirements: debian, added git. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-09 00:30:37 -06:00