Commit graph

105 commits

Author SHA1 Message Date
tmslav
99ad6852b7 production changes 2016-04-10 01:05:33 +00:00
Levi
c33b85626a Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-09 03:00:41 -05:00
Tomislav R
e9c29fb7f9 Merge remote-tracking branch 'upstream/develop' into develop 2016-04-09 09:57:56 +02:00
Levi
0e65c1e717 allowing urls translation into german using .po files 2016-04-09 02:53:05 -05:00
Tomislav R
10d3e236ee home added and assigned right template 2016-04-09 08:51:20 +02:00
Levi
ebe214d95b Create contact page in German and made it editable 2016-04-08 19:45:28 -05:00
Levi
bb8c5314bc Adapt copyright copy to use current year, Add bank account info, Set the correct text on supporters page, HTML Form adapted to Django template, Create forms.py to have all forms, Create Contact Django Form View, Create a HTML template to contact email, Send contact email to info@digitalglarus.ch 2016-04-07 00:26:50 -05:00
1a5b1ec6e1 Merge branch 'master' into develop 2016-04-04 03:33:25 +02:00
3f1f43752f Merge branch 'develop' of https://github.com/ungleich/dynamicweb into develop 2016-04-04 03:32:50 +02:00
Tomislav R
949ee20a8a updated ungleich 2016-04-03 11:46:25 +02:00
Tomislav R
1d18894b60 updated main pages links 2016-04-01 12:37:01 +02:00
Tomislav R
26de99e773 fixed orphaned plugins and add post functionality 2016-03-25 19:18:07 +01:00
Tomislav R
28df2526a8 update django settings for local and production 2016-03-22 22:09:22 +01:00
Tomislav R
1f2c94a053 removed duplicated djangocms 2016-03-22 21:09:59 +01:00
Your Name
1ce3f4bbac resolve merge conflict 2016-03-22 15:16:21 +00:00
Your Name
767d24adb7 resolve merge conflict 2016-03-22 15:12:47 +00:00
Tomislav R
6b78bac53b Blog update 2016-03-22 01:21:50 +01:00
0d04a18a0d server push 2016-03-19 21:28:58 +01:00
0f3ebfdbba settings difference push 2016-03-16 15:23:15 +01:00
Tomislav R
6319515bb4 fixed new user registration 2016-03-16 15:10:48 +01:00
Tomislav R
ff9a6e1b2b fixed requirements 2016-03-16 00:26:49 +01:00
Tomislav R
e5d2d74450 payment app 2016-03-11 19:42:45 +01:00
Tomislav R
2477fbc11b update req file and update directory structure 2016-03-07 19:20:45 +01:00
Tomislav R
b8824b3f46 fixed CustomUser 2016-03-07 18:39:24 +01:00
Tomislav R
3157db235a test 2016-03-07 17:49:02 +01:00
Your Name
8f4dd038bd Merge remote-tracking branch 'refs/remotes/origin/master'
mmit.
2016-03-05 19:57:41 +00:00
Your Name
ec789b625e changes on prod - master 2016-03-05 19:46:46 +00:00
Tomislav R
5fbde4878d update 2016-03-01 21:24:51 +01:00
Tomislav R
abbc2982e3 django version update #3 2016-02-29 23:28:31 +01:00
8e297fcb87 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
f5ca1934c0 dynamicweb/urls: removing static() call
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 16:02:39 -06:00
be7579134f 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
813db391cf dynamicweb/wsgi: using settings.prod module on production
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 14:45:32 -06:00
ca3031dde2 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
f885036d0e 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
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