rascencio
6bc4d5a6a2
digitalglarus: blog_item, added style.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:04:48 -06:00
rascencio
434d614d8f
digitalglarus: templates, glarus_blog styling base
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:04:14 -06:00
rascencio
111cafb418
digitalglarus: templates/base.html added blog link
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:03:51 -06:00
rascencio
d97dd31fc9
views: digitalglarus, added digitalglarus tag on post lookup
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:03:10 -06:00
rascencio
432689999a
Merge branch 'blog' of github.com:yakky/dynamicweb into feature/digital-glarus-blog
2015-09-25 22:03:27 -06:00
rascencio
8a4b1a0c92
digitalglarus: iframe and counter
2015-09-22 04:14:31 -06:00
rascencio
f6fadaaf62
added digitalglarus iframe
2015-09-22 03:20:51 -06:00
rascencio
63157229e1
fixed typo
2015-09-20 18:21:05 -06:00
rascencio
f911a50f50
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2015-09-20 18:20:25 -06:00
testing_rouxdo
44d29cad4a
Typo in september
2015-09-20 20:22:24 +02:00
testing_rouxdo
1d11dfabaa
Merge remote-tracking branch 'origin/feature/set_favicon' into develop
2015-09-20 20:19:34 +02:00
testing_rouxdo
7f981c09c2
Spell error
2015-09-20 19:31:27 +02:00
testing_rouxdo
906c793dda
Changed start-date of crowdfounding to 22th september
2015-09-20 19:26:42 +02:00
testing_rouxdo
9c8941165f
[Hit return to continue]
2015-09-20 19:06:34 +02:00
testing_rouxdo
2c4f48a0cb
Changed index page
...
The index page is no set to the crowdfounding page.
The old index page is now called home.
The crowdfounding page is now in the menu on the first place,
and the home page second.
2015-09-20 16:37:54 +02:00
rascencio
00e728cf07
digitalglarus: fixed typo on digital-glarus crowdfounding -> crowdfunding
2015-09-20 07:58:17 -06:00
testing_rouxdo
8d1ce77af0
Changed subtitle
2015-09-20 14:48:30 +02:00
rascencio
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
rascencio
44bf55943f
removed conflict on digitalglarus/contact.html
2015-09-19 08:25:34 -06:00
testing_rouxdo
a2e54f1327
Added favicon
...
Added favicon in base html template
2015-09-17 16:46:21 +02:00
rascencio
c0933f4de2
fixed image for pricing
2015-09-16 02:06:23 -06:00
rascencio
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
rascencio
d7ba34f7c1
Merge branch 'master' of git-ungleich:dynamicweb
2015-09-16 01:31:17 -06:00
rascencio
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
rascencio
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
rascencio
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