Nico Schottelius
b72dd9c3ca
Merge remote-tracking branch 'origin/feature/djangohosting' into feature/notifybymail
2015-08-27 18:31:59 +02:00
상희 김
b087ad4f15
Add missing images/css
2015-08-27 18:28:45 +02:00
상희 김
cb09599804
Do NOT ignore static in subfolders
2015-08-27 18:28:25 +02:00
Nico Schottelius
59ef61dfe8
merge from sanghee
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-27 18:21:15 +02:00
Nico Schottelius
2bf346495e
begin refactor to /hosting/
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-27 18:20:08 +02:00
상희 김
2e6cd7d8ef
house for sale image
2015-08-16 14:31:09 +02:00
Nico Schottelius
e933b065ca
remove obsolete css
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-09 22:25:07 +02:00
Nico Schottelius
3b49fbfe1e
Merge remote-tracking branch 'origin/feature/djangohosting' into feature/notifybymail
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-09 22:24:23 +02:00
Nico Schottelius
51a398927f
Merge branch 'master' into feature/notifybymail
2015-08-09 22:15:29 +02:00
상희 김
589f0f60a7
nodejs created
2015-08-09 22:13:38 +02:00
Nico Schottelius
e635f856b3
Remove the . in Digital Glarus
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-09 21:42:23 +02:00
Nico Schottelius
99bc3bca10
hotfix: meetup
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-09 21:40:35 +02:00
Nico Schottelius
cfb8d2bd17
Merge branch 'feature/djangohosting'
2015-08-09 18:01:50 +02:00
상희 김
25f950c58e
Merge branch 'feature/djangohosting' of git.ungleich.ch:dynamicweb into feature/djangohosting
2015-08-09 17:53:49 +02:00
상희 김
7514628187
django hosting card image
2015-08-09 17:53:45 +02:00
Nico Schottelius
a665472c32
Quickfix: add vanity domains to allowed_hosts
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-01 01:05:19 +02:00
Nico Schottelius
54387c05d8
Begin to refactor / cleanup hostings
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-30 19:07:29 +02:00
Nico Schottelius
8dd328fcc7
Merge branch 'feature/djangohosting' into develop
2015-07-30 01:14:39 +02:00
Nico Schottelius
c228b371d3
Use rails page for rails
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-30 01:09:23 +02:00
상희 김
76a84e43c8
base template created
2015-07-30 00:11:17 +02:00
Nico Schottelius
5666821682
add route for djangohosting
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-28 21:22:06 +02:00
상희 김
f311cbc059
django.html added
2015-07-28 21:01:59 +02:00
Nico Schottelius
ed9cee2fea
digital.glarus -> Digital Glarus
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-07-20 22:58:49 +02:00
7b8c5eb555
Merge branch 'release/1.4.3'
2015-06-16 02:16:53 -06:00
40958404c6
templates: block meta
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 02:16:16 -06:00
e1d4317679
Merge branch 'release/1.4.2'
2015-06-16 01:48:41 -06:00
e1c3f073a7
Merge branch 'feature/include-django-meta' into develop
2015-06-16 01:48:12 -06:00
27a0fc1c59
requirements: added djangocms-page-meta
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:40:41 -06:00
c6e44f702d
settings: added django-meta configuration.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:37:13 -06:00
cec05aff01
Merge branch 'master' of git.ungleich.ch:dynamicweb into feature/include-django-meta
2015-06-16 01:10:35 -06:00
26df9e036a
Merge branch 'master' of git.ungleich.ch:dynamicweb into develop
2015-06-16 01:06:15 -06:00
a4061c866a
templates: added meta description and block meta.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:05:47 -06:00
9f3ee8a7c8
Merge branch 'release/1.4.1'
2015-06-16 00:31:08 -06:00
85e452490e
templates: Added blog article title to <title>
...
Closes #1628 .
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 00:25:21 -06:00
e230ee0ae8
Merge branch 'feature/hostingapp' into develop
2015-06-15 21:25:08 -06:00
51eeeadf18
docs: added requirements
2015-06-15 00:20:55 -06:00
6cb62e8f29
better by requirements
2015-06-14 15:55:18 -06:00
a225be491c
Merge branch 'hotfix/ckeditor-conf' into develop
2015-06-13 22:41:44 -06:00
04ee920211
Merge branch 'hotfix/ckeditor-conf'
2015-06-13 22:41:34 -06:00
717f1a7268
deleted ckeditor settings
2015-06-13 22:41:29 -06:00
2376ffb284
Merge branch 'hotfix/back_blog_to_placeholder' into develop
2015-06-13 22:38:06 -06:00
ccc2e8537d
Merge branch 'hotfix/back_blog_to_placeholder'
2015-06-13 22:37:45 -06:00
8e87a27c48
settings: use placeholder for blog post.
...
Add a TextFieldPlugin to the blog post
content placeholder by default.
The content added to the model for the articles
is just a TextField, so we loose every plugin
interaction.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 22:35:25 -06:00
aad3b0ea36
Merge branch 'hotfix/placeholderblog' into develop
2015-06-13 22:22:57 -06:00
4c86433046
Merge branch 'hotfix/placeholderblog'
2015-06-13 22:22:42 -06:00
ed2012cd40
settings: added ckeditor configuration
2015-06-13 22:22:36 -06:00
700f35bf01
.
2015-06-13 22:12:00 -06:00
7fe2314c6e
Merge branch 'release/1.4'
2015-06-13 20:20:58 -06:00
c8a616b7b5
gitginore: added vim cache files.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 20:08:07 -06:00
ed9d13d1e4
Merge branch 'feature/conf-https' into develop
2015-06-13 20:06:26 -06:00
