Commit graph

277 commits

Author SHA1 Message Date
00e728cf07 digitalglarus: fixed typo on digital-glarus crowdfounding -> crowdfunding 2015-09-20 07:58:17 -06:00
8d1ce77af0 Changed subtitle 2015-09-20 14:48:30 +02:00
acca06a11d Merge branch 'master' of git.ungleich.ch:dynamicweb into develop
Conflicts:
	.gitignore
	dynamicweb/settings.py
	requirements.txt
2015-09-19 17:02:36 +02:00
44bf55943f removed conflict on digitalglarus/contact.html 2015-09-19 08:25:34 -06:00
a2e54f1327 Added favicon
Added favicon in base html template
2015-09-17 16:46:21 +02:00
c0933f4de2 fixed image for pricing 2015-09-16 02:06:23 -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
81207b8e12 Merge branch 'develop' of git-ungleich:dynamicweb into develop 2015-09-15 11:16:02 -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
상희 김
d05ab01281 price_1 2015-09-15 14:40:14 +02:00
08d22489f0 Merge branch 'master' of git.ungleich.ch:dynamicweb 2015-09-14 06:30:59 -06:00
상희 김
9d4886d456 digital glarus text change 2015-09-13 22:54:18 +02:00
상희 김
11edb307a3 Re-add file that was overseen due to tower move / gitignore 2015-09-09 23:18:47 +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
59ef61dfe8 merge from sanghee
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-27 18:21:15 +02:00
상희 김
2e6cd7d8ef house for sale image 2015-08-16 14:31:09 +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
7016c05942 digital.glarus -> Digital Glarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-20 22:58:49 +02:00
Nico Schottelius
ed9cee2fea digital.glarus -> Digital Glarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-20 22:58:49 +02:00
Nico Schottelius
cd234c4dda digital_glarus -> digitalglarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:34:33 +02:00
Nico Schottelius
da0ece6d63 digital_glarus -> digitalglarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:34:33 +02:00