Commit graph

1460 commits

Author SHA1 Message Date
9be99ab8ee conf: added circus .init for nginx
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:39:48 -06:00
664fb735d9 conf: added circus .init for nginx
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:39:48 -06:00
62c0f014ab config: added circus .ini for webapp
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:39:28 -06:00
a630d3be45 config: added circus .ini for webapp
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:39:28 -06:00
6b5d43a553 requirements: added gevent.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:39:14 -06:00
62bbd14dc4 requirements: added gevent.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:39:14 -06:00
9a27aafd99 deleted foo.txt 2015-05-27 23:28:12 -06:00
3044234a1d deleted foo.txt 2015-05-27 23:28:12 -06:00
c4bfe5f4bd requirements: added circus + chaussette.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-27 23:22:52 -06:00
4971c3cb7d requirements: added circus + chaussette.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-27 23:22:52 -06:00
00d3796e6d txt: added list of debian packages
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-27 23:22:40 -06:00
cc0988135e txt: added list of debian packages
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-27 23:22:40 -06:00
36a9e0483d settings: added memcached config.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-27 23:22:20 -06:00
ff742091c5 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
c9c5935bff 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
b3e7698aea +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
022332bf6f 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
4417524218 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
6aaa04eaa2 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
Nico Schottelius
96f31ed380 import railshosting from static
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 12:21:30 +02:00
f2e1347403 Merge branch 'hotfix/html-links' into develop 2015-05-26 06:47:44 -06:00
f1c365116a Merge branch 'hotfix/html-links' into develop 2015-05-26 06:47:44 -06:00
48036329d9 Merge branch 'hotfix/html-links' 2015-05-26 06:47:33 -06:00
998a045797 Merge branch 'hotfix/html-links' 2015-05-26 06:47:33 -06:00
02f27b0c93 added static links to footer 2015-05-26 06:47:22 -06:00
c292734c11 added static links to footer 2015-05-26 06:47:22 -06:00
0ee5eaba90 Merge branch 'release/version-1.1' 2015-05-26 06:36:24 -06:00
0c060fa519 Merge branch 'release/version-1.1' 2015-05-26 06:36:24 -06:00
97c1e0222e Merge branch 'feature/django-cms-setup' into develop 2015-05-26 06:34:09 -06:00
ca21514136 Merge branch 'feature/django-cms-setup' into develop 2015-05-26 06:34:09 -06:00
a67c024943 test 2015-05-26 06:33:48 -06:00
0132b066c8 test 2015-05-26 06:33:48 -06:00
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
3395220e65 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
02b52b1cf1 requirements: packages updated 2015-05-24 10:26:22 -06:00
37e527bd28 requirements: packages updated 2015-05-24 10:26:22 -06:00
781adaec27 requirements: added stable requirements 2015-05-24 07:29:20 -06:00
c6dad28cda requirements: added stable requirements 2015-05-24 07:29:20 -06:00
463fc370b4 models: ungleich, added app_label to UngleichPage
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-23 04:17:04 -06:00
c3fe70709c models: ungleich, added app_label to UngleichPage
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-23 04:17:04 -06:00
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
280e30ad15 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
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
d57a8dc338 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