|
|
1cd2a30b12
|
settings: cache
|
2015-09-16 02:02:00 -06:00 |
|
|
|
79b9929b1b
|
Merge branch 'master' of git.ungleich.ch:dynamicweb
Conflicts:
digitalglarus/templates/digitalglarus/base.html
digitalglarus/templates/digitalglarus/index.html
|
2015-09-16 09:58:05 +02:00 |
|
|
|
d7ba34f7c1
|
Merge branch 'master' of git-ungleich:dynamicweb
|
2015-09-16 01:31:17 -06:00 |
|
|
|
e022a422d2
|
adding digital glarus landing page and fixed price image
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-09-16 01:11:39 -06:00 |
|
|
|
e91b87a889
|
urls: removed railshosting
|
2015-09-15 14:46:19 -06:00 |
|
|
|
81207b8e12
|
Merge branch 'develop' of git-ungleich:dynamicweb into develop
|
2015-09-15 11:16:02 -06:00 |
|
|
|
086e72c5c6
|
settings: python-memcache -> pylibmc
|
2015-09-15 10:05:46 -06:00 |
|
|
|
8c24aaf2fb
|
Merge branch 'develop' into digital.glarus.corwdfounding
|
2015-09-15 09:38:31 -06:00 |
|
|
|
1338b94e07
|
project: urls, added i18n routes
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-09-15 08:57:56 -06:00 |
|
Nico Schottelius
|
fc52a72221
|
import new image
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-09-15 14:52:27 +02:00 |
|
Nico Schottelius
|
1bd55cece3
|
do not ignore static/
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-09-15 14:52:18 +02:00 |
|
상희 김
|
d05ab01281
|
price_1
|
2015-09-15 14:40:14 +02:00 |
|
|
|
d4948e1979
|
ignoring node_modules and *.db
|
2015-09-14 06:43:48 -06:00 |
|
|
|
08d22489f0
|
Merge branch 'master' of git.ungleich.ch:dynamicweb
|
2015-09-14 06:30:59 -06:00 |
|
|
|
d5434fce8f
|
ignoreing node_modules
|
2015-09-14 06:19:04 -06:00 |
|
상희 김
|
23bc25b6ee
|
Merge remote-tracking branch 'origin/master' into feature/image-digitalglarus
|
2015-09-13 23:02:08 +02:00 |
|
상희 김
|
9d4886d456
|
digital glarus text change
|
2015-09-13 22:54:18 +02:00 |
|
상희 김
|
5cb0ece298
|
Re-add file that was overseen due to tower move / gitignore
|
2015-09-09 23:19:40 +02:00 |
|
상희 김
|
11edb307a3
|
Re-add file that was overseen due to tower move / gitignore
|
2015-09-09 23:18:47 +02:00 |
|
상희 김
|
2cce30f36d
|
Fix requirements
|
2015-09-09 23:09:28 +02:00 |
|
상희 김
|
d3d4078282
|
Remove stable requirements - specify stable in requirements.txt
|
2015-09-09 23:05:22 +02:00 |
|
상희 김
|
5b7c9584db
|
Merge remote-tracking branch 'origin/master'
|
2015-09-09 22:55:54 +02:00 |
|
Iacopo Spalletti
|
06ade77fce
|
PoC integration
|
2015-09-08 06:38:53 +02:00 |
|
Nico Schottelius
|
a5972c1b4a
|
do not commit the secret-key
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-09-08 01:21:28 +02:00 |
|
Nico Schottelius
|
c1e1e4f998
|
read secret key from file
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-09-03 20:05:08 +02:00 |
|
Nico Schottelius
|
874fdf85a2
|
read secret key from file
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-09-03 20:05:08 +02:00 |
|
Nico Schottelius
|
51373f3c22
|
read secret key from file
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-09-03 20:04:12 +02:00 |
|
Nico Schottelius
|
16008512b2
|
Merge branch 'feature/notifybymail' into develop
|
2015-09-03 19:56:39 +02:00 |
|
Nico Schottelius
|
a69ac73f5d
|
Add cards
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-09-03 19:56:31 +02:00 |
|
Nico Schottelius
|
42b0acd45e
|
merge railshosting into hosting
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-08-27 18:33:10 +02:00 |
|
Nico Schottelius
|
b72dd9c3ca
|
Merge remote-tracking branch 'origin/feature/djangohosting' into feature/notifybymail
|
2015-08-27 18:31:59 +02:00 |
|
상희 김
|
b087ad4f15
|
Add missing images/css
|
2015-08-27 18:28:45 +02:00 |
|
상희 김
|
cb09599804
|
Do NOT ignore static in subfolders
|
2015-08-27 18:28:25 +02:00 |
|
Nico Schottelius
|
59ef61dfe8
|
merge from sanghee
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-08-27 18:21:15 +02:00 |
|
Nico Schottelius
|
2bf346495e
|
begin refactor to /hosting/
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-08-27 18:20:08 +02:00 |
|
상희 김
|
2e6cd7d8ef
|
house for sale image
|
2015-08-16 14:31:09 +02:00 |
|
Nico Schottelius
|
8b4e9f451e
|
do not list vanity domains anymore - nginx should filter them
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-08-14 23:35:28 +02:00 |
|
Nico Schottelius
|
e8455e4e46
|
do not list vanity domains anymore - nginx should filter them
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-08-14 23:35:28 +02:00 |
|
Nico Schottelius
|
e933b065ca
|
remove obsolete css
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-08-09 22:25:07 +02:00 |
|
Nico Schottelius
|
3b49fbfe1e
|
Merge remote-tracking branch 'origin/feature/djangohosting' into feature/notifybymail
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-08-09 22:24:23 +02:00 |
|
Nico Schottelius
|
51a398927f
|
Merge branch 'master' into feature/notifybymail
|
2015-08-09 22:15:29 +02:00 |
|
상희 김
|
589f0f60a7
|
nodejs created
|
2015-08-09 22:13:38 +02:00 |
|
Nico Schottelius
|
09e36288ae
|
Remove the . in Digital Glarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-08-09 21:42:23 +02:00 |
|
Nico Schottelius
|
e635f856b3
|
Remove the . in Digital Glarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-08-09 21:42:23 +02:00 |
|
Nico Schottelius
|
862ca6e9c5
|
hotfix: meetup
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-08-09 21:40:35 +02:00 |
|
Nico Schottelius
|
99bc3bca10
|
hotfix: meetup
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-08-09 21:40:35 +02:00 |
|
Nico Schottelius
|
b6ac472f28
|
Merge branch 'feature/djangohosting'
|
2015-08-09 18:01:50 +02:00 |
|
Nico Schottelius
|
cfb8d2bd17
|
Merge branch 'feature/djangohosting'
|
2015-08-09 18:01:50 +02:00 |
|
상희 김
|
25f950c58e
|
Merge branch 'feature/djangohosting' of git.ungleich.ch:dynamicweb into feature/djangohosting
|
2015-08-09 17:53:49 +02:00 |
|
상희 김
|
7514628187
|
django hosting card image
|
2015-08-09 17:53:45 +02:00 |
|
