상희 김
d05ab01281
price_1
2015-09-15 14:40:14 +02:00
상희 김
23bc25b6ee
Merge remote-tracking branch 'origin/master' into feature/image-digitalglarus
2015-09-13 23:02:08 +02:00
상희 김
9d4886d456
digital glarus text change
2015-09-13 22:54:18 +02:00
상희 김
5cb0ece298
Re-add file that was overseen due to tower move / gitignore
2015-09-09 23:19:40 +02:00
상희 김
11edb307a3
Re-add file that was overseen due to tower move / gitignore
2015-09-09 23:18:47 +02:00
상희 김
2cce30f36d
Fix requirements
2015-09-09 23:09:28 +02:00
상희 김
d3d4078282
Remove stable requirements - specify stable in requirements.txt
2015-09-09 23:05:22 +02:00
상희 김
5b7c9584db
Merge remote-tracking branch 'origin/master'
2015-09-09 22:55:54 +02:00
Nico Schottelius
a5972c1b4a
do not commit the secret-key
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-09-08 01:21:28 +02:00
Nico Schottelius
874fdf85a2
read secret key from file
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-09-03 20:05:08 +02:00
Nico Schottelius
e8455e4e46
do not list vanity domains anymore - nginx should filter them
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-14 23:35:28 +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
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
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
rascencio
7b8c5eb555
Merge branch 'release/1.4.3'
2015-06-16 02:16:53 -06:00
rascencio
40958404c6
templates: block meta
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 02:16:16 -06:00
rascencio
e1d4317679
Merge branch 'release/1.4.2'
2015-06-16 01:48:41 -06:00
rascencio
e1c3f073a7
Merge branch 'feature/include-django-meta' into develop
2015-06-16 01:48:12 -06:00
rascencio
27a0fc1c59
requirements: added djangocms-page-meta
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:40:41 -06:00
rascencio
c6e44f702d
settings: added django-meta configuration.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:37:13 -06:00
rascencio
cec05aff01
Merge branch 'master' of git.ungleich.ch:dynamicweb into feature/include-django-meta
2015-06-16 01:10:35 -06:00
rascencio
26df9e036a
Merge branch 'master' of git.ungleich.ch:dynamicweb into develop
2015-06-16 01:06:15 -06:00
rascencio
a4061c866a
templates: added meta description and block meta.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-16 01:05:47 -06:00
rascencio
9f3ee8a7c8
Merge branch 'release/1.4.1'
2015-06-16 00:31:08 -06:00
rascencio
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
rascencio
e230ee0ae8
Merge branch 'feature/hostingapp' into develop
2015-06-15 21:25:08 -06:00
rascencio
51eeeadf18
docs: added requirements
2015-06-15 00:20:55 -06:00
rascencio
6cb62e8f29
better by requirements
2015-06-14 15:55:18 -06:00
rascencio
a225be491c
Merge branch 'hotfix/ckeditor-conf' into develop
2015-06-13 22:41:44 -06:00
rascencio
04ee920211
Merge branch 'hotfix/ckeditor-conf'
2015-06-13 22:41:34 -06:00
rascencio
717f1a7268
deleted ckeditor settings
2015-06-13 22:41:29 -06:00
rascencio
2376ffb284
Merge branch 'hotfix/back_blog_to_placeholder' into develop
2015-06-13 22:38:06 -06:00
rascencio
ccc2e8537d
Merge branch 'hotfix/back_blog_to_placeholder'
2015-06-13 22:37:45 -06:00
rascencio
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
rascencio
aad3b0ea36
Merge branch 'hotfix/placeholderblog' into develop
2015-06-13 22:22:57 -06:00
rascencio
4c86433046
Merge branch 'hotfix/placeholderblog'
2015-06-13 22:22:42 -06:00
rascencio
ed2012cd40
settings: added ckeditor configuration
2015-06-13 22:22:36 -06:00
rascencio
700f35bf01
.
2015-06-13 22:12:00 -06:00
rascencio
7fe2314c6e
Merge branch 'release/1.4'
2015-06-13 20:20:58 -06:00
rascencio
c8a616b7b5
gitginore: added vim cache files.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 20:08:07 -06:00
rascencio
ed9d13d1e4
Merge branch 'feature/conf-https' into develop
2015-06-13 20:06:26 -06:00
rascencio
05ffcaf85a
Makefile: changed target and rsync command.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 20:05:57 -06:00
rascencio
da45722e9a
templates: fixed cdn files to fetch from https
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 16:49:15 -06:00
rascencio
f5337528e9
templates: problem with modals size.
...
see: https://github.com/divio/django-cms/issues/3465
Signed-off-by: rscnt <rascnt@gmail.com>
2015-06-13 13:59:37 -06:00
rascencio