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

143 commits

This branch
This branch
All branches
Author SHA1 Message Date
rscnt
9170ae68db 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
db4a84aea4 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
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
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
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
a01c171b17 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
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
rscnt
207fc31417 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
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
rscnt
dcb97295f0 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
ef9849c56f 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
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
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
376f637ec7 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
bb7f0cf73a Makefile, added install_debian_packages task. 
install_debian_packages:

   Simply excutes apt-get update and installs the
   packages listed in ./requirements.debian.txt

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-08 23:29:44 -06:00
rscnt
fe4f6c97d5 new static files. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-08 23:26:27 -06:00
rscnt
83e792bcaa makefile, rsync_upload ignoring .pyc files and vim cache. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-08 23:22:58 -06:00
rscnt
12b418ca08 added Makefile with only one task "rsync_upload". 
I wanted to use fabric, but it's to much hassle.

The rsync_upload task uploads the project using rsync by ssh.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-08 23:19:00 -06:00
rscnt
f58c7dfc75 ignore emacs cache files 2015-06-08 23:03:13 -06:00
rscnt
e18b445724 deleted "libjpeg". 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-08 22:56:15 -06:00
rscnt
3cc98b608e requirements: debian, postgresql-dev don't exists. 
+ Added package "postgresql-client-9.4"

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-08 22:49:51 -06:00
rscnt
e4a79a8541 requirements: debian, replaced libjpeg package. 
+ libjpeg8 -> libjpeg62-turbo-dev
+ Removed comment segment on python3-lxml so we can
  do xargs.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-08 22:45:05 -06:00
상희 김
42ad6efe7c font Raleway, room img replaced 2015-06-08 20:24:56 +02:00
상희 김
e26edfdf09 Merge branch 'master' of git.ungleich.ch:dynamicweb into railshosting 2015-06-08 19:04:43 +02:00
rscnt
34990d687b debian: added Pillow dependencies. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-31 07:32:39 -06:00
rscnt
d7b809f3f6 Merge branch 'feature/production-1.1' into develop 2015-05-31 05:44:07 -06:00
rscnt
090df0798c configs: added circus config example. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-31 05:36:57 -06:00
rscnt
3338894c23 configs: added nginx conf example 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-31 05:36:45 -06:00
rscnt
f3b560f602 settings: options for text editor and let host use x forwarded 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-31 05:32:11 -06:00
rscnt
24c263811a settings: fixed typo on media. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-31 04:52:53 -06:00
rscnt
1fa008a999 Merge branch 'develop' of git.ungleich.ch:dynamicweb into feature/production-1.1 2015-05-30 23:22:31 -06:00
rscnt
9f4b59384a requirements: added gevent and circus git. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-30 23:18:11 -06:00
rscnt
37968cfa71 configs: ungleich circus. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-30 23:17:58 -06:00
rscnt
f2506eb26f config: added admin 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-30 20:29:49 -06:00
rscnt
f5f35b859b templates: added 404 and 505. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-30 20:29:38 -06:00
rscnt
6a2e819155 Merge branch 'feature/integrate-railshosting' into develop 2015-05-30 15:31:57 -06:00