moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
110 commits 11 branches 113 tags 314 MiB
Commit graph

110 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
rscnt
68ce62d503 migrations: merge brings the same migration. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-30 15:31:07 -06:00
rscnt
5829c9fa4a Merge branch 'railshosting' of git.ungleich.ch:dynamicweb into feature/integrate-railshosting 
Conflicts:
dynamicweb/settings.py
    Added railshosting app and deleted .settings_local import.
dynamicweb/urls.py
   Added railshosting url.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-30 15:29:33 -06:00
rscnt
9d521f3384 configs: added include proxy conf example. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 02:30:28 -06:00
rscnt
0734110804 configs: replaced gevent with meinheld. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 02:30:14 -06:00
rscnt
f087832151 configs: debian packages added 
- added circus nginx conf fix.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 02:10:21 -06:00
rscnt
755f70a1ef config: nginx example, prefered a complete config 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 02:09:19 -06:00
rscnt
d80b3835ca config: circus fixed nginx example. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 02:09:05 -06:00
rscnt
1d70f97347 conf: added example conf for nginx proxy 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 00:40:07 -06:00
rscnt
9be99ab8ee conf: added circus .init for nginx 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 00:39:48 -06:00
rscnt
62c0f014ab config: added circus .ini for webapp 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 00:39:28 -06:00
rscnt
6b5d43a553 requirements: added gevent. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 00:39:14 -06:00
rscnt
9a27aafd99 deleted foo.txt 2015-05-27 23:28:12 -06:00
rscnt
c4bfe5f4bd requirements: added circus + chaussette. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-27 23:22:52 -06:00
rscnt
00d3796e6d txt: added list of debian packages 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-27 23:22:40 -06:00
rscnt
36a9e0483d settings: added memcached config. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-27 23:22:20 -06:00
Nico Schottelius
4027ecb8b1 fix bottom script error 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-27 21:48:41 +02:00
Nico Schottelius
b155fb2c81 +migration 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-27 21:31:35 +02:00
Nico Schottelius
9eab2c58cf add google tracking 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-27 17:39:59 +02:00
Nico Schottelius
921ba59db3 unicorn instead of uwsgi 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-27 15:56:51 +02:00
Nico Schottelius
023dad86df get railshosting running 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-27 15:41:43 +02:00
Nico Schottelius
f09ee6cd79 import railshosting from static 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-27 12:21:30 +02:00
rscnt
f2e1347403 Merge branch 'hotfix/html-links' into develop 2015-05-26 06:47:44 -06:00
rscnt
48036329d9 Merge branch 'hotfix/html-links' 2015-05-26 06:47:33 -06:00
rscnt
02f27b0c93 added static links to footer 2015-05-26 06:47:22 -06:00
rscnt
0ee5eaba90 Merge branch 'release/version-1.1' 2015-05-26 06:36:24 -06:00
rscnt
97c1e0222e Merge branch 'feature/django-cms-setup' into develop 2015-05-26 06:34:09 -06:00
rscnt
a67c024943 test 2015-05-26 06:33:48 -06:00
rscnt
d9883cc503 models: UngleichPage, -image_header +image 
The filed image_header was removed, and
a new filed image was added, the reason
for this change is that image being a
FilerImageFiled can make use of previously
uploaded images while with image_header only
uploads where available.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-24 10:59:26 -06:00
rscnt
02b52b1cf1 requirements: packages updated 2015-05-24 10:26:22 -06:00
rscnt
781adaec27 requirements: added stable requirements 2015-05-24 07:29:20 -06:00
rscnt
463fc370b4 models: ungleich, added app_label to UngleichPage 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-23 04:17:04 -06:00
rscnt
2ca57ed4d1 tempaltes: Added blog templates. 
An override of the djangocms_blog templates.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-23 04:16:38 -06:00
rscnt
81e108a011 tempaltes: Added usable tempaltes. 
+ cms/ungleich.ch/blog.html:
   This template should only be used
   to page with the Blog application set.
   Although it doesn't declare anything special
   than exposing the content block.

+ cms/ungleich.ch/index.html: Not used. Example?

+ cms/ungleich.ch/page.html:
    A template for generic pages, it only declares
    a placeholder inside the base_content where
    you should but the content for the page.

+ cms/ungleich.ch/__init__.py
    See documentation for django cms regarding
    template_dirs settings option.
    Used for namespacing and order.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-23 04:12:51 -06:00