sanghee
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
143 Commits 10 Branches 82 Tags 313 MiB
Commit Graph

39 Commits

Author SHA1 Message Date
rascencio d6acb6a9e1 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 cd234c4dda digital_glarus -> digitalglarus 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-06-10 23:34:33 +02:00
Nico Schottelius a26a2ec105 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
rascencio b138526c8f 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
rascencio f3b560f602 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
rascencio 24c263811a settings: fixed typo on media. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-31 04:52:53 -06:00
rascencio 1fa008a999 Merge branch 'develop' of git.ungleich.ch:dynamicweb into feature/production-1.1 2015-05-30 23:22:31 -06:00
rascencio f2506eb26f config: added admin 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-30 20:29:49 -06:00
rascencio 5829c9fa4a 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
rascencio 36a9e0483d settings: added memcached config. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-27 23:22:20 -06:00
Nico Schottelius 023dad86df get railshosting running 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-27 15:41:43 +02:00
rascencio 76bfb3c47b 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
rascencio 37ebf40620 settings: added django_compressor 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-22 01:31:44 -06:00
rascencio e0675ee071 requirements: Added django-bootstrap3 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-22 00:02:05 -06:00
rascencio 2f412b8457 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
rascencio fd5e6517dd settings: fixed typo. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-21 22:43:18 -06:00
rascencio 180c8683b8 settings: added template dirs. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-21 02:17:05 -06:00
rascencio d34ab5fa3a settings: moved 'djangocms_admin_style' on INSTALLED_APP 2015-05-21 01:44:31 -06:00
rascencio f0bcad7497 settings: how, did I? confuse template with core? 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-21 01:24:56 -06:00
rascencio 1107b41db0 settings: added locale middleware 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-21 01:21:08 -06:00
rascencio f0b5ea8966 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
rascencio b0f8acbe35 settings: Replaced ROOT_PATH call with BASE_DIR. 
custom.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 23:36:08 -06:00
rascencio 0a47b1778d 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
rascencio e861773064 settings: added APP_ROOT_ENDPOINT, fixed reference 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 23:33:10 -06:00
rascencio d8cbc04248 settings: ckeditr ingration with django-filer. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 23:24:49 -06:00
rascencio c7aaba3da6 settings: added migrations & thumbnail_processors 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 23:23:45 -06:00
rascencio 28120c6c22 settings: Added TEMPLATE_DIRS tuple and MEDIA_* 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 22:57:00 -06:00
rascencio 3359c4fa18 settings: added template_processors for django cms 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 22:42:05 -06:00
rascencio f514198f7a settings: added django-cms middlewares. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 22:39:30 -06:00
rascencio 7a386806f9 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
rascencio b9deacad4e settings: added apps for django-cms 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 22:06:24 -06:00
rascencio a1c97d96ce settings: added local_settings. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-20 20:57:22 -06:00
Nico Schottelius c05c253b42 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 2b9ebdf96c postgres module 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-14 01:24:40 +02:00
Nico Schottelius c3f24179fc update db to postgres 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-14 01:22:20 +02:00
Nico Schottelius bba227428d support local settings 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-14 01:19:55 +02:00
Nico Schottelius c80fb547bb setup new static dir 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-12 23:44:30 +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