From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 10 Jul 2018 14:22:49 +0000 (+0200)
Subject: Fix tinymce_setup.js path, remove STATICFILES_DIRS, update modules
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d15b015b968d61fc1d706e173c080588300df743;p=mezzo.git

Fix tinymce_setup.js path, remove STATICFILES_DIRS, update modules
---

diff --git a/app/settings.py b/app/settings.py
index 0e0eae79..e2e3fc3b 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -179,10 +179,6 @@ STATIC_URL = "/static/"
 # STATIC_ROOT = os.path.join(PROJECT_ROOT, STATIC_URL.strip("/"))
 STATIC_ROOT = '/srv/static/'
 
-STATICFILES_DIRS = [
-    '/srv/lib/mezzanine-organization/organization/static'
-]
-
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
@@ -458,7 +454,7 @@ FILEBROWSER_SELECT_FORMATS = {
 GRAPPELLI_INSTALLED = True
 # JQUERY_FILENAME = 'jquery-3.1.0.min.js'
 JQUERY_UI_FILENAME = 'jquery-ui-1.9.2.min.js'
-TINYMCE_SETUP_JS = "/static/js/tinymce_setup.js"
+TINYMCE_SETUP_JS = "js/tinymce_setup.js"
 
 ADMIN_MENU_ORDER = (
     (_('Pages'), ('pages.Page', 'organization-pages.Home',
diff --git a/bin b/bin
index a9128f09..febb3a07 160000
--- a/bin
+++ b/bin
@@ -1 +1 @@
-Subproject commit a9128f09ae8c3c88afa533e330ed4005eb6bb22f
+Subproject commit febb3a07c475c2280199d8040902effcf7eb473d
diff --git a/lib/mezzanine-organization b/lib/mezzanine-organization
index 3a9b2c84..4de86c7e 160000
--- a/lib/mezzanine-organization
+++ b/lib/mezzanine-organization
@@ -1 +1 @@
-Subproject commit 3a9b2c84c5141805fc3b052061e768d708626aa4
+Subproject commit 4de86c7e69001a16efb8d7bd88719d358b9fb247
diff --git a/lib/mezzanine-organization-themes b/lib/mezzanine-organization-themes
index c89b4de4..b5499422 160000
--- a/lib/mezzanine-organization-themes
+++ b/lib/mezzanine-organization-themes
@@ -1 +1 @@
-Subproject commit c89b4de4b1fab344abdf7c4cb89680f8b79675b0
+Subproject commit b549942259c15cfa1f7fe8bad1a995ce6837ef0c