Commit Graph

481 Commits

Author SHA1 Message Date
rascencio 7dab2111f3 digitalglarus: removed border from post images
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 16:46:30 -06:00
rascencio 69a827951b digitalglarus: modified style on blog post 2015-09-26 16:37:53 -06:00
rascencio 6deb4cd64c digitalglarus: modified styles of post detail
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 16:09:47 -06:00
rascencio eb1d4b04a5 digitalglarus: changed style of posts.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 16:03:09 -06:00
rascencio dbc53d0deb digitalglarus: added styles for post and blog.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 15:53:57 -06:00
rascencio 061096d435 deleted binary file... 2015-09-26 13:43:15 -06:00
rascencio f3c14fab11 digitalglarus: templates blog fixed image 2015-09-26 13:42:46 -06:00
rascencio 2cc4ea226d digitalglarus: fixed blog views typo
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:31:36 -06:00
rascencio 16051bbf2e Merge branch 'feature/digital-glarus-blog' into develop 2015-09-26 13:08:58 -06:00
rascencio 023a58a7d7 digitalglarus: styling on post details and list.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:08:14 -06:00
rascencio c10fea0169 digitalglarus: templates. blog_meta inline metadata.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 13:07:52 -06:00
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 fd1b987bb6 hosting: fixed views function calls 2015-09-22 05:37:22 -06:00
rascencio 0a83b1494d dynamicweb: hotfix railshosting 2015-09-22 05:28:34 -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 684f5af001 Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop 2015-09-21 02:27:34 +02:00
rascencio 6f2bd6654c Merge branch 'develop' of https://github.com/ungleich/dynamicweb into develop 2015-09-21 02:22:51 +02: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
rascencio a4095f42e2 Merge remote-tracking branch 'origin/develop' into develop 2015-09-20 20:20:26 +02:00
testing_rouxdo 1d11dfabaa Merge remote-tracking branch 'origin/feature/set_favicon' into develop 2015-09-20 20:19:34 +02:00
rascencio aa7905d6a0 Merge remote-tracking branch 'origin/develop' into develop 2015-09-20 19:33:34 +02:00
testing_rouxdo 7f981c09c2 Spell error 2015-09-20 19:31:27 +02:00
rascencio f01adc2d9f Merge remote-tracking branch 'origin/develop' into develop 2015-09-20 19:27:21 +02:00
testing_rouxdo 906c793dda Changed start-date of crowdfounding to 22th september 2015-09-20 19:26:42 +02:00
rascencio af0ce20881 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	digitalglarus/templates/digitalglarus/base.html
2015-09-20 19:10:50 +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 7a21ae5bc8 changed .gitignore 2015-09-17 16:56:12 +02: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 1cd2a30b12 settings: cache 2015-09-16 02:02:00 -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 e91b87a889 urls: removed railshosting 2015-09-15 14:46:19 -06:00
rascencio 81207b8e12 Merge branch 'develop' of git-ungleich:dynamicweb into develop 2015-09-15 11:16:02 -06:00
rascencio 086e72c5c6 settings: python-memcache -> pylibmc 2015-09-15 10:05:46 -06:00
rascencio 8c24aaf2fb Merge branch 'develop' into digital.glarus.corwdfounding 2015-09-15 09:38:31 -06:00
rascencio 1338b94e07 project: urls, added i18n routes
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-15 08:57:56 -06:00