|
|
0ccf491441
|
Merge branch 'master' into develop
|
2016-04-04 03:33:25 +02:00 |
|
|
|
67002a0a03
|
Merge branch 'develop' of https://github.com/ungleich/dynamicweb into develop
|
2016-04-04 03:32:50 +02:00 |
|
Tomislav R
|
24badb1a9c
|
updated ungleich
|
2016-04-03 11:46:25 +02:00 |
|
Tomislav R
|
5fd4275046
|
updated main pages links
|
2016-04-01 12:37:01 +02:00 |
|
Tomislav R
|
ddb4de2954
|
fixed orphaned plugins and add post functionality
|
2016-03-25 19:18:07 +01:00 |
|
Tomislav R
|
105dad3b9f
|
update django settings for local and production
|
2016-03-22 22:09:22 +01:00 |
|
Tomislav R
|
18c75cf00e
|
removed duplicated djangocms
|
2016-03-22 21:09:59 +01:00 |
|
Your Name
|
08e47294cd
|
resolve merge conflict
|
2016-03-22 15:16:21 +00:00 |
|
Your Name
|
d57fc21784
|
resolve merge conflict
|
2016-03-22 15:12:47 +00:00 |
|
Tomislav R
|
ca033be061
|
Blog update
|
2016-03-22 01:21:50 +01:00 |
|
|
|
039399b95b
|
server push
|
2016-03-19 21:28:58 +01:00 |
|
|
|
b7b0be4497
|
settings difference push
|
2016-03-16 15:23:15 +01:00 |
|
Tomislav R
|
0a7dd2fa3d
|
fixed new user registration
|
2016-03-16 15:10:48 +01:00 |
|
Tomislav R
|
baef7e4aa8
|
fixed requirements
|
2016-03-16 00:26:49 +01:00 |
|
Tomislav R
|
6223f4a1ef
|
payment app
|
2016-03-11 19:42:45 +01:00 |
|
Tomislav R
|
f82e0604ca
|
update req file and update directory structure
|
2016-03-07 19:20:45 +01:00 |
|
Tomislav R
|
5c6e0cf7c6
|
fixed CustomUser
|
2016-03-07 18:39:24 +01:00 |
|
Tomislav R
|
e7f11e9556
|
test
|
2016-03-07 17:49:02 +01:00 |
|
Your Name
|
de875f80de
|
Merge remote-tracking branch 'refs/remotes/origin/master'
mmit.
|
2016-03-05 19:57:41 +00:00 |
|
Your Name
|
e99f23551b
|
changes on prod - master
|
2016-03-05 19:46:46 +00:00 |
|
Tomislav R
|
7936e5dfe5
|
update
|
2016-03-01 21:24:51 +01:00 |
|
Tomislav R
|
0558d6e396
|
django version update #3
|
2016-02-29 23:28:31 +01:00 |
|
|
|
cc9959d632
|
settings/base: refactor - pep8, also added djangocms-blog parler conf
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-05 01:02:18 -06:00 |
|
|
|
d55a02c015
|
dynamicweb/urls: removing static() call
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 16:02:39 -06:00 |
|
|
|
55d1c94c38
|
dynamicweb/settings: local is now using DEBUG=True
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 15:59:23 -06:00 |
|
|
|
e863a8c037
|
dynamicweb/settings: base, using PROJECT_ROOT instead of BASE_DIR
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 15:58:52 -06:00 |
|
|
|
7aa5586ed3
|
dynamicweb/wsgi: using settings.prod module on production
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 14:45:32 -06:00 |
|
|
|
bec5a7319d
|
dynamicweb/urls: fetch project settings instead of project settings module
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 14:45:04 -06:00 |
|
|
|
aec2cd4298
|
dynamicweb: added settings module with different files for each env
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 14:44:18 -06:00 |
|
|
|
05c8bf3d37
|
dynamicweb: deleted old settings files
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-11-02 14:41:21 -06:00 |
|
|
|
fd3dd6ba46
|
digitalglarus: changing lang menu content.
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-10-04 19:31:40 -06:00 |
|
|
|
a4c3c341a3
|
digitalglarus: changes on urls
|
2015-10-04 16:48:33 -06:00 |
|
|
|
1b17e2aac1
|
digitalglarus: fix urls for blog.
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-10-04 15:38:53 -06:00 |
|
|
|
0827c6f2ff
|
digitalglarus: moving digital glarus static url.
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-10-04 15:20:39 -06:00 |
|
|
|
9d38d3aee6
|
digitalglarus: i18n django-cms conf
|
2015-10-04 09:38:01 -06:00 |
|
|
|
df9b0eacaa
|
Merge branch 'feature/digital.glarus.german' into develop
|
2015-10-04 09:23:56 -06:00 |
|
|
|
4b69077414
|
dynamicweb: settings, added German lang, changed templates.
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-10-04 08:08:19 -06:00 |
|
|
|
0a83b1494d
|
dynamicweb: hotfix railshosting
|
2015-09-22 05:28:34 -06:00 |
|
|
|
e91b87a889
|
urls: removed railshosting
|
2015-09-15 14:46:19 -06:00 |
|
|
|
81207b8e12
|
Merge branch 'develop' of git-ungleich:dynamicweb into develop
|
2015-09-15 11:16:02 -06:00 |
|
|
|
086e72c5c6
|
settings: python-memcache -> pylibmc
|
2015-09-15 10:05:46 -06:00 |
|
|
|
1338b94e07
|
project: urls, added i18n routes
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-09-15 08:57:56 -06: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
|
51373f3c22
|
read secret key from file
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
|
2015-09-03 20:04:12 +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 |
|
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
|
51a398927f
|
Merge branch 'master' into feature/notifybymail
|
2015-08-09 22:15:29 +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 |
|
|
|
27a0fc1c59
|
requirements: added djangocms-page-meta
Signed-off-by: rscnt <rascnt@gmail.com>
|
2015-06-16 01:40:41 -06:00 |
|
