|
|
d7ba34f7c1
|
Merge branch 'master' of git-ungleich:dynamicweb
|
2015-09-16 01:31:17 -06:00 |
|
|
|
e022a422d2
|
adding digital glarus landing page and fixed price image
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-09-16 01:11:39 -06:00 |
|
Nico Schottelius
|
fc52a72221
|
import new image
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-09-15 14:52:27 +02:00 |
|
Nico Schottelius
|
1bd55cece3
|
do not ignore static/
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-09-15 14:52:18 +02:00 |
|
상희 김
|
d05ab01281
|
price_1
|
2015-09-15 14:40:14 +02:00 |
|
|
|
08d22489f0
|
Merge branch 'master' of git.ungleich.ch:dynamicweb
|
2015-09-14 06:30:59 -06:00 |
|
|
|
d5434fce8f
|
ignoreing node_modules
|
2015-09-14 06:19:04 -06: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
|
7016c05942
|
digital.glarus -> Digital Glarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-07-20 22:58:49 +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 |
|
|
|
004524b7c5
|
Merge branch 'release/1.4.3'
|
2015-06-16 02:16:53 -06:00 |
|
|
|
7b8c5eb555
|
Merge branch 'release/1.4.3'
|
2015-06-16 02:16:53 -06:00 |
|
|
|
753c6c2af0
|
templates: block meta
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-06-16 02:16:16 -06:00 |
|
|
|
40958404c6
|
templates: block meta
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-06-16 02:16:16 -06:00 |
|
|
|
d6631bcf25
|
Merge branch 'release/1.4.2'
|
2015-06-16 01:48:41 -06:00 |
|
|
|
e1d4317679
|
Merge branch 'release/1.4.2'
|
2015-06-16 01:48:41 -06:00 |
|
|
|
4ce7ba0198
|
Merge branch 'feature/include-django-meta' into develop
|
2015-06-16 01:48:12 -06:00 |
|
|
|
e1c3f073a7
|
Merge branch 'feature/include-django-meta' into develop
|
2015-06-16 01:48:12 -06:00 |
|
|
|
ca7efc1f71
|
requirements: added djangocms-page-meta
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-06-16 01:40:41 -06:00 |
|
|
|
27a0fc1c59
|
requirements: added djangocms-page-meta
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-06-16 01:40:41 -06:00 |
|
|
|
9c5dd3c152
|
settings: added django-meta configuration.
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-06-16 01:37:13 -06:00 |
|
|
|
c6e44f702d
|
settings: added django-meta configuration.
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-06-16 01:37:13 -06:00 |
|
|
|
38a5ffa606
|
Merge branch 'master' of git.ungleich.ch:dynamicweb into feature/include-django-meta
|
2015-06-16 01:10:35 -06:00 |
|
|
|
cec05aff01
|
Merge branch 'master' of git.ungleich.ch:dynamicweb into feature/include-django-meta
|
2015-06-16 01:10:35 -06:00 |
|
|
|
5c2b60b1fc
|
Merge branch 'master' of git.ungleich.ch:dynamicweb into develop
|
2015-06-16 01:06:15 -06:00 |
|
|
|
26df9e036a
|
Merge branch 'master' of git.ungleich.ch:dynamicweb into develop
|
2015-06-16 01:06:15 -06:00 |
|
|
|
7444c36392
|
templates: added meta description and block meta.
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-06-16 01:05:47 -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 |
|
|
|
3f5339129c
|
Merge branch 'release/1.4.1'
|
2015-06-16 00:31:08 -06:00 |
|
|
|
9f3ee8a7c8
|
Merge branch 'release/1.4.1'
|
2015-06-16 00:31:08 -06:00 |
|
|
|
d335c2bd57
|
templates: Added blog article title to <title>
Closes #1628.
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-06-16 00:25:21 -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 |
|
|
|
46d3c084e7
|
Merge branch 'feature/hostingapp' into develop
|
2015-06-15 21:25:08 -06:00 |
|
