Commit graph

1954 commits

Author SHA1 Message Date
8a90caf7da digitalglarus: submenu for digitalglarus 2015-10-04 16:57:50 -06:00
a4c3c341a3 digitalglarus: changes on urls 2015-10-04 16:48:33 -06:00
1b17e2aac1 digitalglarus: fix urls for blog.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 15:38:53 -06:00
50e0cb9a71 digitalglarus: fixed typo on menu call
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 15:26:05 -06:00
eb9c1cebdb Merge branch 'feature/digital.glarus.navigation' into develop 2015-10-04 15:21:08 -06:00
0827c6f2ff digitalglarus: moving digital glarus static url.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 15:20:39 -06:00
b338ba6092 digitalglarus: cms navigation.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 15:13:13 -06:00
6b292531de Merge branch 'release/digital.glarus.german' 2015-10-04 10:48:56 -06:00
5b6b8d1427 digital.glarus: cms templates don't have to call 'static' base.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 10:45:06 -06:00
450ecc069b digitalglarus: removed bad menu lang-chooser call
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 10:44:43 -06:00
f9b3cfbf48 templates: cms, removed DG.Detail from django-cms
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 10:44:25 -06:00
9d38d3aee6 digitalglarus: i18n django-cms conf 2015-10-04 09:38:01 -06:00
df9b0eacaa Merge branch 'feature/digital.glarus.german' into develop 2015-10-04 09:23:56 -06:00
9f2fa42302 templates: added html for digital.glarus cms.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 08:33:48 -06:00
b12a273a1d templates: cms, moved ungleich.ch -> ungleichch
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 08:27:44 -06:00
4b69077414 dynamicweb: settings, added German lang, changed templates.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 08:08:19 -06:00
78c6c45a0b project: removed circus egg and deps.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 08:04:23 -06:00
3035364d39 digitalglarus: index should display home. 2015-10-01 12:49:56 -06:00
f561dd9144 digitalglarus: modified contact iframe gmap.
The Google Map iframe needs to confirm to the schema of
the host server.
2015-09-30 12:24:00 -06:00
6ca9d50306 digitalglarus: blog, small changes on blog style
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-27 20:51:00 -06:00
45c386f247 fixed typo 2015-09-26 17:15:07 -06:00
51b95bfce7 digitalglarus: setting every image under the post should be 'responsive' 2015-09-26 17:13:25 -06:00
a5fe61d43c digitalglarus: spacing between post details 2015-09-26 16:56:14 -06:00
7dab2111f3 digitalglarus: removed border from post images
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 16:46:30 -06:00
69a827951b digitalglarus: modified style on blog post 2015-09-26 16:37:53 -06:00
6deb4cd64c digitalglarus: modified styles of post detail
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 16:09:47 -06:00
eb1d4b04a5 digitalglarus: changed style of posts.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 16:03:09 -06:00
dbc53d0deb digitalglarus: added styles for post and blog.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-26 15:53:57 -06:00
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