Commit Graph

  • e933b065ca remove obsolete css Nico Schottelius 2015-08-09 22:25:07 +0200
  • 3b49fbfe1e Merge remote-tracking branch 'origin/feature/djangohosting' into feature/notifybymail Nico Schottelius 2015-08-09 22:24:23 +0200
  • 51a398927f Merge branch 'master' into feature/notifybymail Nico Schottelius 2015-08-09 22:15:29 +0200
  • 589f0f60a7 nodejs created 상희 김 2015-08-09 22:13:38 +0200
  • 09e36288ae Remove the . in Digital Glarus Nico Schottelius 2015-08-09 21:42:23 +0200
  • e635f856b3 Remove the . in Digital Glarus Nico Schottelius 2015-08-09 21:42:23 +0200
  • 862ca6e9c5 hotfix: meetup Nico Schottelius 2015-08-09 21:40:35 +0200
  • 99bc3bca10 hotfix: meetup Nico Schottelius 2015-08-09 21:40:35 +0200
  • b6ac472f28 Merge branch 'feature/djangohosting' old-2.0 Nico Schottelius 2015-08-09 18:01:50 +0200
  • cfb8d2bd17 Merge branch 'feature/djangohosting' Nico Schottelius 2015-08-09 18:01:50 +0200
  • 25f950c58e Merge branch 'feature/djangohosting' of git.ungleich.ch:dynamicweb into feature/djangohosting 상희 김 2015-08-09 17:53:49 +0200
  • 7514628187 django hosting card image 상희 김 2015-08-09 17:53:45 +0200
  • 3869fab391 Quickfix: add vanity domains to allowed_hosts Nico Schottelius 2015-08-01 01:05:19 +0200
  • a665472c32 Quickfix: add vanity domains to allowed_hosts Nico Schottelius 2015-08-01 01:05:19 +0200
  • 54387c05d8 Begin to refactor / cleanup hostings Nico Schottelius 2015-07-30 19:07:29 +0200
  • 8dd328fcc7 Merge branch 'feature/djangohosting' into develop Nico Schottelius 2015-07-30 01:14:39 +0200
  • c72fef6714 Use rails page for rails Nico Schottelius 2015-07-30 01:09:23 +0200
  • c228b371d3 Use rails page for rails Nico Schottelius 2015-07-30 01:09:23 +0200
  • 95e354bf0d base template created 상희 김 2015-07-30 00:11:17 +0200
  • 76a84e43c8 base template created 상희 김 2015-07-30 00:11:17 +0200
  • b2c120fd9e add route for djangohosting Nico Schottelius 2015-07-28 21:22:06 +0200
  • 5666821682 add route for djangohosting Nico Schottelius 2015-07-28 21:22:06 +0200
  • 395c2851ed django.html added 상희 김 2015-07-28 21:01:59 +0200
  • f311cbc059 django.html added 상희 김 2015-07-28 21:01:59 +0200
  • 7016c05942 digital.glarus -> Digital Glarus Nico Schottelius 2015-07-20 22:58:49 +0200
  • ed9cee2fea digital.glarus -> Digital Glarus Nico Schottelius 2015-07-20 22:58:49 +0200
  • 004524b7c5 Merge branch 'release/1.4.3' rascencio 2015-06-16 02:16:53 -0600
  • 7b8c5eb555 Merge branch 'release/1.4.3' rascencio 2015-06-16 02:16:53 -0600
  • 753c6c2af0 templates: block meta rascencio 2015-06-16 02:16:16 -0600
  • 40958404c6 templates: block meta rascencio 2015-06-16 02:16:16 -0600
  • d6631bcf25 Merge branch 'release/1.4.2' rascencio 2015-06-16 01:48:41 -0600
  • e1d4317679 Merge branch 'release/1.4.2' rascencio 2015-06-16 01:48:41 -0600
  • 4ce7ba0198 Merge branch 'feature/include-django-meta' into develop rascencio 2015-06-16 01:48:12 -0600
  • e1c3f073a7 Merge branch 'feature/include-django-meta' into develop rascencio 2015-06-16 01:48:12 -0600
  • ca7efc1f71 requirements: added djangocms-page-meta rascencio 2015-06-16 01:37:52 -0600
  • 27a0fc1c59 requirements: added djangocms-page-meta rascencio 2015-06-16 01:37:52 -0600
  • 9c5dd3c152 settings: added django-meta configuration. rascencio 2015-06-16 01:37:13 -0600
  • c6e44f702d settings: added django-meta configuration. rascencio 2015-06-16 01:37:13 -0600
  • 38a5ffa606 Merge branch 'master' of git.ungleich.ch:dynamicweb into feature/include-django-meta rascencio 2015-06-16 01:10:35 -0600
  • cec05aff01 Merge branch 'master' of git.ungleich.ch:dynamicweb into feature/include-django-meta rascencio 2015-06-16 01:10:35 -0600
  • 5c2b60b1fc Merge branch 'master' of git.ungleich.ch:dynamicweb into develop rascencio 2015-06-16 01:06:15 -0600
  • 26df9e036a Merge branch 'master' of git.ungleich.ch:dynamicweb into develop rascencio 2015-06-16 01:06:15 -0600
  • 7444c36392 templates: added meta description and block meta. rascencio 2015-06-16 01:05:47 -0600
  • a4061c866a templates: added meta description and block meta. rascencio 2015-06-16 01:05:47 -0600
  • 3f5339129c Merge branch 'release/1.4.1' rascencio 2015-06-16 00:31:08 -0600
  • 9f3ee8a7c8 Merge branch 'release/1.4.1' rascencio 2015-06-16 00:31:08 -0600
  • d335c2bd57 templates: Added blog article title to <title> rascencio 2015-06-16 00:25:21 -0600
  • 85e452490e templates: Added blog article title to <title> rascencio 2015-06-16 00:25:21 -0600
  • 46d3c084e7 Merge branch 'feature/hostingapp' into develop rascencio 2015-06-15 21:25:08 -0600
  • e230ee0ae8 Merge branch 'feature/hostingapp' into develop rascencio 2015-06-15 21:25:08 -0600
  • f72b297118 docs: added requirements rascencio 2015-06-15 00:20:55 -0600
  • 51eeeadf18 docs: added requirements rascencio 2015-06-15 00:20:55 -0600
  • 7b2bb05a80 better by requirements rascencio 2015-06-14 15:55:18 -0600
  • 6cb62e8f29 better by requirements rascencio 2015-06-14 15:55:18 -0600
  • 9c1dd92e21 Merge branch 'hotfix/ckeditor-conf' into develop rascencio 2015-06-13 22:41:44 -0600
  • a225be491c Merge branch 'hotfix/ckeditor-conf' into develop rascencio 2015-06-13 22:41:44 -0600
  • b710a9810e Merge branch 'hotfix/ckeditor-conf' rascencio 2015-06-13 22:41:34 -0600
  • 04ee920211 Merge branch 'hotfix/ckeditor-conf' rascencio 2015-06-13 22:41:34 -0600
  • a8efa4ff6a deleted ckeditor settings rascencio 2015-06-13 22:41:29 -0600
  • 717f1a7268 deleted ckeditor settings rascencio 2015-06-13 22:41:29 -0600
  • 1d6d411367 Merge branch 'hotfix/back_blog_to_placeholder' into develop rascencio 2015-06-13 22:38:06 -0600
  • 2376ffb284 Merge branch 'hotfix/back_blog_to_placeholder' into develop rascencio 2015-06-13 22:38:06 -0600
  • f97720e913 Merge branch 'hotfix/back_blog_to_placeholder' rascencio 2015-06-13 22:37:45 -0600
  • ccc2e8537d Merge branch 'hotfix/back_blog_to_placeholder' rascencio 2015-06-13 22:37:45 -0600
  • bc418132d1 settings: use placeholder for blog post. rascencio 2015-06-13 22:35:25 -0600
  • 8e87a27c48 settings: use placeholder for blog post. rascencio 2015-06-13 22:35:25 -0600
  • f206861942 Merge branch 'hotfix/placeholderblog' into develop rascencio 2015-06-13 22:22:57 -0600
  • aad3b0ea36 Merge branch 'hotfix/placeholderblog' into develop rascencio 2015-06-13 22:22:57 -0600
  • 2c347193e9 Merge branch 'hotfix/placeholderblog' rascencio 2015-06-13 22:22:42 -0600
  • 4c86433046 Merge branch 'hotfix/placeholderblog' rascencio 2015-06-13 22:22:42 -0600
  • aa9158a538 settings: added ckeditor configuration rascencio 2015-06-13 22:22:36 -0600
  • ed2012cd40 settings: added ckeditor configuration rascencio 2015-06-13 22:22:36 -0600
  • adb966fc90 . rascencio 2015-06-13 22:12:00 -0600
  • 700f35bf01 . rascencio 2015-06-13 22:12:00 -0600
  • 9170ae68db Merge branch 'release/1.4' rascencio 2015-06-13 20:20:58 -0600
  • 7fe2314c6e Merge branch 'release/1.4' rascencio 2015-06-13 20:20:58 -0600
  • a1c7f47e98 gitginore: added vim cache files. rascencio 2015-06-13 20:08:07 -0600
  • c8a616b7b5 gitginore: added vim cache files. rascencio 2015-06-13 20:08:07 -0600
  • db4a84aea4 Merge branch 'feature/conf-https' into develop rascencio 2015-06-13 20:06:26 -0600
  • ed9d13d1e4 Merge branch 'feature/conf-https' into develop rascencio 2015-06-13 20:06:26 -0600
  • 228ae9c7a8 Makefile: changed target and rsync command. rascencio 2015-06-13 20:05:57 -0600
  • 05ffcaf85a Makefile: changed target and rsync command. rascencio 2015-06-13 20:05:57 -0600
  • b214a1d6dc templates: fixed cdn files to fetch from https rascencio 2015-06-13 16:49:15 -0600
  • da45722e9a templates: fixed cdn files to fetch from https rascencio 2015-06-13 16:49:15 -0600
  • a1085cae75 templates: problem with modals size. rascencio 2015-06-13 13:59:37 -0600
  • f5337528e9 templates: problem with modals size. rascencio 2015-06-13 13:59:37 -0600
  • d6acb6a9e1 settings: bootstrap3 and djangocms-blog rascencio 2015-06-13 13:47:45 -0600
  • 181ca7cb59 settings: bootstrap3 and djangocms-blog rascencio 2015-06-13 13:47:45 -0600
  • a01c171b17 Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop rascencio 2015-06-13 12:20:34 -0600
  • fc2d09d9ac Merge branch 'develop' of git.ungleich.ch:dynamicweb into develop rascencio 2015-06-13 12:20:34 -0600
  • 9c07c4c39a gitignore: static folder rascencio 2015-06-13 09:36:03 -0600
  • 7083428824 gitignore: static folder rascencio 2015-06-13 09:36:03 -0600
  • b619a2b57a mount djangocms on / again - found working nginx config Nico Schottelius 2015-06-12 21:45:33 +0200
  • 640f99bbed mount djangocms on / again - found working nginx config Nico Schottelius 2015-06-12 21:45:33 +0200
  • b49e60378a restore blog.ungleich.ch temporarily Nico Schottelius 2015-06-12 19:04:18 +0200
  • 29773e45ab restore blog.ungleich.ch temporarily Nico Schottelius 2015-06-12 19:04:18 +0200
  • 002fc42a46 do not add files below static/ to git Nico Schottelius 2015-06-12 17:40:54 +0200
  • d5e4189f86 do not add files below static/ to git Nico Schottelius 2015-06-12 17:40:54 +0200
  • 587c08e0ab empty static Nico Schottelius 2015-06-12 17:40:06 +0200
  • 82da769573 empty static Nico Schottelius 2015-06-12 17:40:06 +0200