moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1205 commits 11 branches 113 tags 314 MiB
Commit graph

188 commits

Author SHA1 Message Date
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
rscnt
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
rscnt
d55a02c015 dynamicweb/urls: removing static() call 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-11-02 16:02:39 -06:00
rscnt
55d1c94c38 dynamicweb/settings: local is now using DEBUG=True 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-11-02 15:59:23 -06:00
rscnt
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
rscnt
7aa5586ed3 dynamicweb/wsgi: using settings.prod module on production 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-11-02 14:45:32 -06:00
rscnt
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
rscnt
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
rscnt
05c8bf3d37 dynamicweb: deleted old settings files 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-11-02 14:41:21 -06:00
rscnt
fd3dd6ba46 digitalglarus: changing lang menu content. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-10-04 19:31:40 -06:00
rscnt
a4c3c341a3 digitalglarus: changes on urls 2015-10-04 16:48:33 -06:00
rscnt
1b17e2aac1 digitalglarus: fix urls for blog. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-10-04 15:38:53 -06:00
rscnt
0827c6f2ff digitalglarus: moving digital glarus static url. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-10-04 15:20:39 -06:00
rscnt
9d38d3aee6 digitalglarus: i18n django-cms conf 2015-10-04 09:38:01 -06:00
rscnt
df9b0eacaa Merge branch 'feature/digital.glarus.german' into develop 2015-10-04 09:23:56 -06:00
rscnt
4b69077414 dynamicweb: settings, added German lang, changed templates. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-10-04 08:08:19 -06:00
rscnt
0a83b1494d dynamicweb: hotfix railshosting 2015-09-22 05:28:34 -06:00
rscnt
e91b87a889 urls: removed railshosting 2015-09-15 14:46:19 -06:00
rscnt
81207b8e12 Merge branch 'develop' of git-ungleich:dynamicweb into develop 2015-09-15 11:16:02 -06:00
rscnt
086e72c5c6 settings: python-memcache -> pylibmc 2015-09-15 10:05:46 -06:00
rscnt
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
rscnt
27a0fc1c59 requirements: added djangocms-page-meta 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-16 01:40:41 -06:00
rscnt
c6e44f702d settings: added django-meta configuration. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-16 01:37:13 -06:00
rscnt
717f1a7268 deleted ckeditor settings 2015-06-13 22:41:29 -06:00
rscnt
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
rscnt
ed2012cd40 settings: added ckeditor configuration 2015-06-13 22:22:36 -06:00
rscnt
181ca7cb59 settings: bootstrap3 and djangocms-blog 
+ Now BLOG_USE_PLACEHOLDER is False, this should
  give us a HTML Text field for the article body.
+ The URLs for the bootstrap and jquery cnd location
  changed, now there should not be problem fetching them
  over https

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-13 13:47:45 -06:00
Nico Schottelius
640f99bbed mount djangocms on / again - found working nginx config 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-06-12 21:45:33 +02:00
Nico Schottelius
da0ece6d63 digital_glarus -> digitalglarus 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-06-10 23:34:33 +02:00
Nico Schottelius
46ce08909d mount cms below cms - easier for nginx mapping 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-06-10 21:16:08 +02:00
rscnt
ae0ece8f18 settings: the migration module for django_cms_text_ckeditor changed. 
It would be better to use an stable.requirements.txt

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-06-09 01:49:48 -06:00
rscnt
de74539fa6 settings: options for text editor and let host use x forwarded 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-31 05:32:11 -06:00
rscnt
9fe61554a7 settings: fixed typo on media. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-31 04:52:53 -06:00
rscnt
411588d6d3 Merge branch 'develop' of git.ungleich.ch:dynamicweb into feature/production-1.1 2015-05-30 23:22:31 -06:00
rscnt
5ef00d1bb9 config: added admin 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-30 20:29:49 -06:00
rscnt
5d9c306573 Merge branch 'railshosting' of git.ungleich.ch:dynamicweb into feature/integrate-railshosting 
Conflicts:
dynamicweb/settings.py
    Added railshosting app and deleted .settings_local import.
dynamicweb/urls.py
   Added railshosting url.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-30 15:29:33 -06:00
rscnt
ff742091c5 settings: added memcached config. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-27 23:22:20 -06:00
Nico Schottelius
6aaa04eaa2 get railshosting running 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-27 15:41:43 +02:00
rscnt
bad0870035 Added ungleich app to extend Page models. 
Ungleich app has a model called UngleichPage,
this model has an attribute called image_header
which will be used to set the background image for
the page header.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-23 00:33:35 -06:00
rscnt
d6fdaea4ed settings: added django_compressor 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-22 01:31:44 -06:00
rscnt
0a9955986e requirements: Added django-bootstrap3 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-22 00:02:05 -06:00
rscnt
9e995c66d4 settings: changed CMS_TEMPLATE_DIR value. 
- For the SITE_ID=1, templates will be looked
  on the first entry for TEMPLATE_DIRS option.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-21 22:51:23 -06:00
rscnt
dec8dd7aad settings: fixed typo. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-21 22:43:18 -06:00
rscnt
3bca8a22df settings: added template dirs. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-21 02:17:05 -06:00
rscnt
36f0ec962e settings: moved 'djangocms_admin_style' on INSTALLED_APP 2015-05-21 01:44:31 -06:00
rscnt
7aa821fdfd urls: added taggit_autosuggest.url, djangocms-blog 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-21 01:29:42 -06:00
rscnt
46332a208c settings: how, did I? confuse template with core? 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-21 01:24:56 -06:00
rscnt
5ef77152c1 urls: imports, forgot, dumb. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-21 01:21:22 -06:00
rscnt
063d278304 settings: added locale middleware 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-21 01:21:08 -06:00
rscnt
3ba99ee417 settings: fixed migrations calls. 
The migrations for the new version of
django-cms were in cms/migrations/* not
cms/migrations_django/* .

- Fixed: local_settings import.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-21 01:10:54 -06:00
rscnt
e7b8fcc9b8 local_settings: in example call settings ok. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-21 01:10:09 -06:00
rscnt
7cdd9d2859 settings: Replaced ROOT_PATH call with BASE_DIR. 
custom.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 23:36:08 -06:00
rscnt
e939806380 settings: fixed references on vars. 
None != nil, too much ruby.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 23:34:24 -06:00
rscnt
fe8e6d13d1 settings: added APP_ROOT_ENDPOINT, fixed reference 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 23:33:10 -06:00
rscnt
7a713041aa urls: added django-cms urls to project urls.py 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 23:30:03 -06:00
rscnt
1c95a518d9 settings: ckeditr ingration with django-filer. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 23:24:49 -06:00
rscnt
440e449229 settings: added migrations & thumbnail_processors 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 23:23:45 -06:00
rscnt
e97f2b8d3b settings: Added TEMPLATE_DIRS tuple and MEDIA_* 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 22:57:00 -06:00
rscnt
38a5e1e7ec settings: added template_processors for django cms 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 22:42:05 -06:00
rscnt
e98abedf2e settings: added django-cms middlewares. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 22:39:30 -06:00
rscnt
d2e978caeb settings: adapting settings for django1.7 
- Fixed: call to local.local_settings module.
- Added: TEMPLATE_CONTEXT_PROCESSORS tuple,
     django 1.7 requirement.
- Added: SITE_ID variable.
- Added: 'django.contrib.sites' to INSTALLED_APPS
     tuple for django 1.7 compatibility.
- Fixed: Languages code settings.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 22:38:22 -06:00
rscnt
4563872d75 settings: added apps for django-cms 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 22:06:24 -06:00
rscnt
b77d1db911 settings: added local_settings. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 20:57:22 -06:00
Nico Schottelius
5238b257c4 do not print - but ignore if localsettings are not existing 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-14 11:58:43 +02:00
Nico Schottelius
9b48d37674 postgres module 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-14 01:24:40 +02:00
Nico Schottelius
cccd076a3b update db to postgres 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-14 01:22:20 +02:00
Nico Schottelius
04c50ec314 support local settings 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-14 01:19:55 +02:00
Nico Schottelius
0c3fcdee29 setup new static dir 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-12 23:44:30 +02:00
Nico Schottelius
9350814f57 add detail view 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-05-02 19:00:38 +02:00
Nico Schottelius
5d1b26d4f7 add first view to digital.glarus 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-05-02 17:15:20 +02:00
Nico Schottelius
cdd6998301 register app 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-05-02 17:07:08 +02:00
Nico Schottelius
086195073b Init 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-05-02 01:30:30 +02:00