061096d435
deleted binary file...
2015-09-26 13:43:15 -06:00
f3c14fab11
digitalglarus: templates blog fixed image
2015-09-26 13:42:46 -06:00
2cc4ea226d
digitalglarus: fixed blog views typo
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:31:36 -06:00
16051bbf2e
Merge branch 'feature/digital-glarus-blog' into develop
2015-09-26 13:08:58 -06:00
023a58a7d7
digitalglarus: styling on post details and list.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:08:14 -06:00
c10fea0169
digitalglarus: templates. blog_meta inline metadata.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:07:52 -06:00
6bc4d5a6a2
digitalglarus: blog_item, added style.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:04:48 -06:00
434d614d8f
digitalglarus: templates, glarus_blog styling base
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:04:14 -06:00
111cafb418
digitalglarus: templates/base.html added blog link
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:03:51 -06:00
d97dd31fc9
views: digitalglarus, added digitalglarus tag on post lookup
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:03:10 -06:00
432689999a
Merge branch 'blog' of github.com:yakky/dynamicweb into feature/digital-glarus-blog
2015-09-25 22:03:27 -06:00
fd1b987bb6
hosting: fixed views function calls
2015-09-22 05:37:22 -06:00
0a83b1494d
dynamicweb: hotfix railshosting
2015-09-22 05:28:34 -06:00
8a4b1a0c92
digitalglarus: iframe and counter
2015-09-22 04:14:31 -06:00
f6fadaaf62
added digitalglarus iframe
2015-09-22 03:20:51 -06:00
684f5af001
Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop
2015-09-21 02:27:34 +02:00
6f2bd6654c
Merge branch 'develop' of https://github.com/ungleich/dynamicweb into develop
2015-09-21 02:22:51 +02:00
63157229e1
fixed typo
2015-09-20 18:21:05 -06:00
f911a50f50
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2015-09-20 18:20:25 -06:00
44d29cad4a
Typo in september
2015-09-20 20:22:24 +02:00
a4095f42e2
Merge remote-tracking branch 'origin/develop' into develop
2015-09-20 20:20:26 +02:00
1d11dfabaa
Merge remote-tracking branch 'origin/feature/set_favicon' into develop
2015-09-20 20:19:34 +02:00
aa7905d6a0
Merge remote-tracking branch 'origin/develop' into develop
2015-09-20 19:33:34 +02:00
7f981c09c2
Spell error
2015-09-20 19:31:27 +02:00
f01adc2d9f
Merge remote-tracking branch 'origin/develop' into develop
2015-09-20 19:27:21 +02:00
906c793dda
Changed start-date of crowdfounding to 22th september
2015-09-20 19:26:42 +02:00
af0ce20881
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
digitalglarus/templates/digitalglarus/base.html
2015-09-20 19:10:50 +02:00
9c8941165f
[Hit return to continue]
2015-09-20 19:06:34 +02:00
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
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
7a21ae5bc8
changed .gitignore
2015-09-17 16:56:12 +02: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
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
