amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2041 commits 8 branches 146 tags 314 MiB
Commit graph

2041 commits

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