Commit Graph

  • 1b17e2aac1 digitalglarus: fix urls for blog. rascencio 2015-10-04 15:38:53 -0600
  • 50e0cb9a71 digitalglarus: fixed typo on menu call rascencio 2015-10-04 15:26:05 -0600
  • eb9c1cebdb Merge branch 'feature/digital.glarus.navigation' into develop rascencio 2015-10-04 15:21:08 -0600
  • 0827c6f2ff digitalglarus: moving digital glarus static url. rascencio 2015-10-04 15:20:39 -0600
  • b338ba6092 digitalglarus: cms navigation. rascencio 2015-10-04 15:13:13 -0600
  • 6b292531de Merge branch 'release/digital.glarus.german' rascencio 2015-10-04 10:48:56 -0600
  • 5b6b8d1427 digital.glarus: cms templates don't have to call 'static' base. rascencio 2015-10-04 10:45:06 -0600
  • 450ecc069b digitalglarus: removed bad menu lang-chooser call rascencio 2015-10-04 10:44:43 -0600
  • f9b3cfbf48 templates: cms, removed DG.Detail from django-cms rascencio 2015-10-04 10:44:25 -0600
  • 9d38d3aee6 digitalglarus: i18n django-cms conf rascencio 2015-10-04 09:38:01 -0600
  • df9b0eacaa Merge branch 'feature/digital.glarus.german' into develop rascencio 2015-10-04 09:23:56 -0600
  • 9f2fa42302 templates: added html for digital.glarus cms. rascencio 2015-10-04 08:33:48 -0600
  • b12a273a1d templates: cms, moved ungleich.ch -> ungleichch rascencio 2015-10-04 08:27:44 -0600
  • 4b69077414 dynamicweb: settings, added German lang, changed templates. rascencio 2015-10-04 08:08:19 -0600
  • 78c6c45a0b project: removed circus egg and deps. rascencio 2015-10-04 08:04:23 -0600
  • 3035364d39 digitalglarus: index should display home. rascencio 2015-10-01 12:49:56 -0600
  • f561dd9144 digitalglarus: modified contact iframe gmap. rascencio 2015-09-30 12:24:00 -0600
  • 6ca9d50306 digitalglarus: blog, small changes on blog style rascencio 2015-09-27 20:51:00 -0600
  • 45c386f247 fixed typo rascencio 2015-09-26 17:15:07 -0600
  • 51b95bfce7 digitalglarus: setting every image under the post should be 'responsive' rascencio 2015-09-26 17:13:25 -0600
  • a5fe61d43c digitalglarus: spacing between post details rascencio 2015-09-26 16:56:14 -0600
  • 7dab2111f3 digitalglarus: removed border from post images rascencio 2015-09-26 16:46:30 -0600
  • 69a827951b digitalglarus: modified style on blog post rascencio 2015-09-26 16:37:53 -0600
  • 6deb4cd64c digitalglarus: modified styles of post detail rascencio 2015-09-26 16:09:47 -0600
  • eb1d4b04a5 digitalglarus: changed style of posts. rascencio 2015-09-26 16:03:09 -0600
  • dbc53d0deb digitalglarus: added styles for post and blog. rascencio 2015-09-26 15:53:57 -0600
  • 061096d435 deleted binary file... rascencio 2015-09-26 13:43:15 -0600
  • f3c14fab11 digitalglarus: templates blog fixed image rascencio 2015-09-26 13:42:46 -0600
  • 2cc4ea226d digitalglarus: fixed blog views typo rascencio 2015-09-26 13:31:36 -0600
  • 16051bbf2e Merge branch 'feature/digital-glarus-blog' into develop rascencio 2015-09-26 13:08:58 -0600
  • 023a58a7d7 digitalglarus: styling on post details and list. rascencio 2015-09-26 13:08:14 -0600
  • c10fea0169 digitalglarus: templates. blog_meta inline metadata. rascencio 2015-09-26 13:07:52 -0600
  • 6bc4d5a6a2 digitalglarus: blog_item, added style. rascencio 2015-09-26 13:04:48 -0600
  • 434d614d8f digitalglarus: templates, glarus_blog styling base rascencio 2015-09-26 13:04:14 -0600
  • 111cafb418 digitalglarus: templates/base.html added blog link rascencio 2015-09-26 13:03:51 -0600
  • d97dd31fc9 views: digitalglarus, added digitalglarus tag on post lookup rascencio 2015-09-26 13:03:10 -0600
  • 432689999a Merge branch 'blog' of github.com:yakky/dynamicweb into feature/digital-glarus-blog rascencio 2015-09-25 22:03:27 -0600
  • fd1b987bb6 hosting: fixed views function calls rascencio 2015-09-22 05:37:22 -0600
  • 0a83b1494d dynamicweb: hotfix railshosting rascencio 2015-09-22 05:28:34 -0600
  • 8a4b1a0c92 digitalglarus: iframe and counter rascencio 2015-09-22 04:14:31 -0600
  • f6fadaaf62 added digitalglarus iframe rascencio 2015-09-22 03:20:51 -0600
  • 684f5af001 Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop rascencio 2015-09-21 02:27:34 +0200
  • 6f2bd6654c Merge branch 'develop' of https://github.com/ungleich/dynamicweb into develop rascencio 2015-09-21 02:22:51 +0200
  • 63157229e1 fixed typo rascencio 2015-09-20 18:21:05 -0600
  • f911a50f50 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop rascencio 2015-09-20 18:20:25 -0600
  • 44d29cad4a Typo in september testing_rouxdo 2015-09-20 20:22:24 +0200
  • a4095f42e2 Merge remote-tracking branch 'origin/develop' into develop rascencio 2015-09-20 20:20:26 +0200
  • 1d11dfabaa Merge remote-tracking branch 'origin/feature/set_favicon' into develop testing_rouxdo 2015-09-20 20:19:34 +0200
  • aa7905d6a0 Merge remote-tracking branch 'origin/develop' into develop rascencio 2015-09-20 19:33:34 +0200
  • 7f981c09c2 Spell error testing_rouxdo 2015-09-20 19:31:27 +0200
  • f01adc2d9f Merge remote-tracking branch 'origin/develop' into develop rascencio 2015-09-20 19:27:21 +0200
  • 906c793dda Changed start-date of crowdfounding to 22th september testing_rouxdo 2015-09-20 19:26:42 +0200
  • af0ce20881 Merge remote-tracking branch 'origin/develop' into develop rascencio 2015-09-20 19:10:50 +0200
  • 9c8941165f [Hit return to continue] testing_rouxdo 2015-09-20 19:06:34 +0200
  • 2c4f48a0cb Changed index page testing_rouxdo 2015-09-20 16:37:54 +0200
  • 00e728cf07 digitalglarus: fixed typo on digital-glarus crowdfounding -> crowdfunding rascencio 2015-09-20 07:58:17 -0600
  • 8d1ce77af0 Changed subtitle testing_rouxdo 2015-09-20 14:48:30 +0200
  • acca06a11d Merge branch 'master' of git.ungleich.ch:dynamicweb into develop rascencio 2015-09-19 17:02:36 +0200
  • 44bf55943f removed conflict on digitalglarus/contact.html rascencio 2015-09-19 08:25:34 -0600
  • 7a21ae5bc8 changed .gitignore testing_rouxdo 2015-09-17 16:56:12 +0200
  • a2e54f1327 Added favicon testing_rouxdo 2015-09-17 16:46:21 +0200
  • c0933f4de2 fixed image for pricing rascencio 2015-09-16 02:06:23 -0600
  • 1cd2a30b12 settings: cache rascencio 2015-09-16 02:02:00 -0600
  • 79b9929b1b Merge branch 'master' of git.ungleich.ch:dynamicweb rascencio 2015-09-16 09:58:05 +0200
  • d7ba34f7c1 Merge branch 'master' of git-ungleich:dynamicweb rascencio 2015-09-16 01:31:17 -0600
  • e022a422d2 adding digital glarus landing page and fixed price image rascencio 2015-09-16 01:11:39 -0600
  • e91b87a889 urls: removed railshosting rascencio 2015-09-15 14:46:19 -0600
  • 81207b8e12 Merge branch 'develop' of git-ungleich:dynamicweb into develop rascencio 2015-09-15 11:16:02 -0600
  • 086e72c5c6 settings: python-memcache -> pylibmc rascencio 2015-09-15 10:05:46 -0600
  • 8c24aaf2fb Merge branch 'develop' into digital.glarus.corwdfounding rascencio 2015-09-15 09:38:31 -0600
  • 1338b94e07 project: urls, added i18n routes rascencio 2015-09-15 08:57:56 -0600
  • fc52a72221 import new image Nico Schottelius 2015-09-15 14:52:27 +0200
  • 1bd55cece3 do not ignore static/ Nico Schottelius 2015-09-15 14:52:18 +0200
  • d05ab01281 price_1 상희 김 2015-09-15 14:40:14 +0200
  • d4948e1979 ignoring node_modules and *.db rascencio 2015-09-14 06:43:30 -0600
  • 08d22489f0 Merge branch 'master' of git.ungleich.ch:dynamicweb rascencio 2015-09-14 06:30:59 -0600
  • d5434fce8f ignoreing node_modules rascencio 2015-09-14 06:19:04 -0600
  • 23bc25b6ee Merge remote-tracking branch 'origin/master' into feature/image-digitalglarus 상희 김 2015-09-13 23:02:08 +0200
  • 9d4886d456 digital glarus text change 상희 김 2015-09-13 22:54:18 +0200
  • 5cb0ece298 Re-add file that was overseen due to tower move / gitignore 상희 김 2015-09-09 23:18:47 +0200
  • 11edb307a3 Re-add file that was overseen due to tower move / gitignore 상희 김 2015-09-09 23:18:47 +0200
  • 2cce30f36d Fix requirements 상희 김 2015-09-09 23:09:28 +0200
  • d3d4078282 Remove stable requirements - specify stable in requirements.txt 상희 김 2015-09-09 23:05:22 +0200
  • 5b7c9584db Merge remote-tracking branch 'origin/master' 상희 김 2015-09-09 22:55:54 +0200
  • 06ade77fce PoC integration Iacopo Spalletti 2015-09-08 06:23:32 +0200
  • a5972c1b4a do not commit the secret-key Nico Schottelius 2015-09-08 01:21:28 +0200
  • c1e1e4f998 read secret key from file Nico Schottelius 2015-09-03 20:04:12 +0200
  • 874fdf85a2 read secret key from file Nico Schottelius 2015-09-03 20:04:12 +0200
  • 51373f3c22 read secret key from file Nico Schottelius 2015-09-03 20:04:12 +0200
  • 16008512b2 Merge branch 'feature/notifybymail' into develop Nico Schottelius 2015-09-03 19:56:39 +0200
  • a69ac73f5d Add cards Nico Schottelius 2015-09-03 19:56:31 +0200
  • 42b0acd45e merge railshosting into hosting Nico Schottelius 2015-08-27 18:33:10 +0200
  • b72dd9c3ca Merge remote-tracking branch 'origin/feature/djangohosting' into feature/notifybymail Nico Schottelius 2015-08-27 18:31:59 +0200
  • b087ad4f15 Add missing images/css 상희 김 2015-08-27 18:28:45 +0200
  • cb09599804 Do NOT ignore static in subfolders 상희 김 2015-08-27 18:28:25 +0200
  • 59ef61dfe8 merge from sanghee Nico Schottelius 2015-08-27 18:21:15 +0200
  • 2bf346495e begin refactor to /hosting/ Nico Schottelius 2015-08-27 18:20:08 +0200
  • 2e6cd7d8ef house for sale image 상희 김 2015-08-16 14:31:09 +0200
  • 8b4e9f451e do not list vanity domains anymore - nginx should filter them Nico Schottelius 2015-08-14 23:35:28 +0200
  • e8455e4e46 do not list vanity domains anymore - nginx should filter them Nico Schottelius 2015-08-14 23:35:28 +0200