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

1088 commits

This branch
This branch
All branches
Author SHA1 Message Date
rscnt
1fa008a999 Merge branch 'develop' of git.ungleich.ch:dynamicweb into feature/production-1.1 2015-05-30 23:22:31 -06:00
rscnt
411588d6d3 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
d10e7fc0b5 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
ad48104d3a 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
5ef00d1bb9 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
182335fd10 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
e4aa678152 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
a52cd6d44d 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
5d9c306573 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
088a271d54 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
0e9d71512e 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
b9f7564048 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
1620a60905 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
b7be16f5ad 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
b43ce77ad4 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
664fb735d9 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
a630d3be45 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
62bbd14dc4 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
3044234a1d 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
4971c3cb7d 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
cc0988135e 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
rscnt
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