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

5154 commits

This branch
This branch
All branches
Author SHA1 Message Date
상희 김
42ad6efe7c font Raleway, room img replaced 2015-06-08 20:24:56 +02:00
상희 김
808176f12b 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
상희 김
decc01b641 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
7e4ed0a5d9 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
29b86ed501 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
b5863b2c2a 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
ea45fc77e0 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
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
rscnt
24c263811a settings: fixed typo on media. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-31 04:52:53 -06:00
rscnt
9fe61554a7 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
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