Commit graph

145 commits

Author SHA1 Message Date
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
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
b173facd67 requirements: debian, added git.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-09 00:30:37 -06:00
a1bc6ea99a 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
bb68c32ba5 new static files.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-08 23:26:27 -06:00
5da7cfab99 makefile, rsync_upload ignoring .pyc files and vim cache.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-08 23:22:58 -06:00
bc8f440391 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
36797bbd0f ignore emacs cache files 2015-06-08 23:03:13 -06:00
e209282136 deleted "libjpeg".
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-08 22:56:15 -06:00
7b7d7e5dd4 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
10c88fabc3 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
상희 김
808176f12b font Raleway, room img replaced 2015-06-08 20:24:56 +02:00
상희 김
decc01b641 Merge branch 'master' of git.ungleich.ch:dynamicweb into railshosting 2015-06-08 19:04:43 +02:00
7e4ed0a5d9 debian: added Pillow dependencies.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 07:32:39 -06:00
29b86ed501 Merge branch 'feature/production-1.1' into develop 2015-05-31 05:44:07 -06:00
b5863b2c2a configs: added circus config example.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 05:36:57 -06:00
ea45fc77e0 configs: added nginx conf example
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 05:36:45 -06:00
de74539fa6 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
9fe61554a7 settings: fixed typo on media.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-31 04:52:53 -06:00
411588d6d3 Merge branch 'develop' of git.ungleich.ch:dynamicweb into feature/production-1.1 2015-05-30 23:22:31 -06:00
d10e7fc0b5 requirements: added gevent and circus git.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 23:18:11 -06:00
ad48104d3a configs: ungleich circus.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 23:17:58 -06:00
5ef00d1bb9 config: added admin
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 20:29:49 -06:00