Merge branch 'release/2.7'

newmips · Nov 21, 2018 · f169368 · f169368
2 parents ad880e7 + 301f5aa
commit f169368
Show file tree

Hide file tree

Showing 240 changed files with 15,317 additions and 13,862 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,4 +48,5 @@ dist/
 nbdist/
 .nb-gradle/
 sql/import
-structure/template/public/themes/
+structure/template/public/themes/
+package-lock.json
diff --git a/config/database.js b/config/database.js
@@ -2,39 +2,28 @@ var globalConf = require('./global');
 
 var databaseConf = {
     develop: {
-        connection: {
-            host: '127.0.0.1',
-            port: '3306',
-            user: 'newmips',
-            password: 'newmips',
-            database: 'newmips',
-            users_table: 'user',
-            dateStrings: 'true'
-        }
+        host: '127.0.0.1',
+        port: '3306', //mysql: 3306 - postgres: 5432
+        user: 'newmips',
+        password: 'newmips',
+        database: 'newmips',
+        dialect: 'mysql'  //mysql or postgres
     },
-
-    production: {
-        connection: {
-            host: '127.0.0.1',
-            port: '3306',
-            user: 'newmips',
-            password: 'newmips',
-            database: 'newmips',
-            users_table: 'user',
-            dateStrings: 'true'
-        }
-    },
-
     recette: {
-        connection: {
-            host: '127.0.0.1',
-            port: '3306',
-            user: 'newmips',
-            password: 'newmips',
-            database: 'newmips',
-            users_table: 'user',
-            dateStrings: 'true'
-        }
+        host: '127.0.0.1',
+        port: '3306',
+        user: 'newmips',
+        password: 'newmips',
+        database: 'newmips',
+        dialect: 'mysql'
+    },
+    production: {
+        host: '127.0.0.1',
+        port: '3306',
+        user: 'newmips',
+        password: 'newmips',
+        database: 'newmips',
+        dialect: 'mysql'
     }
 }
 

diff --git a/config/gitlab.js b/config/gitlab.js
@@ -2,13 +2,31 @@ var globalConf = require('./global');
 
 var config = {
     develop: {
-        "doGit": false,
-        "protocol": "http",
-        "url": "cloud.newmips.com:1400",
-        "sshUrl": "git@cloud.newmips.com",
-        "useSSH": true,
-        "adminUser": "",
-        "privateToken": ""
+        doGit: false, // Should the application try to push your app on a repository ?
+        protocol: "http",
+        url: "", // Your gitlab url
+        sshUrl: "", // Something like git@yourgitlaburl
+        useSSH: true, // Todo HTTP non handled for now
+        adminUser: "", // Gitlab admin user
+        privateToken: "" // Gitlab private token
+    },
+    recette: {
+        doGit: false,
+        protocol: "http",
+        url: "",
+        sshUrl: "",
+        useSSH: true,
+        adminUser: "",
+        privateToken: ""
+    },
+    production: {
+        doGit: false,
+        protocol: "http",
+        url: "",
+        sshUrl: "",
+        useSSH: true,
+        adminUser: "",
+        privateToken: ""
     }
 }
 

diff --git a/config/global.js b/config/global.js
@@ -1,7 +1,7 @@
 // Global configuration file
 var fs = require('fs');
-
 var env = 'develop';
+
 var config = {
 	'develop': {
 		env: 'develop',
@@ -18,8 +18,8 @@ var config = {
 		host: '127.0.0.1',
 		port: process.env.PORT || 1337,
 		ssl: {
-			key: /*fs.readFileSync('./cacerts/private.key')*/"toRemove",
-			cert: /*fs.readFileSync('./cacerts/wildcard_newmips.crt')*/"toRemove",
+			key: /*fs.readFileSync('./cacerts/private.key')*/"fakeKey",
+			cert: /*fs.readFileSync('./cacerts/wildcard_newmips.crt')*/"fakeCert",
 			passphrase : ''
 		},
 		slack_chat_enabled: false
@@ -31,20 +31,11 @@ var config = {
 		host: '127.0.0.1',
 		port: process.env.PORT || 1337,
 		ssl: {
-			key: /*fs.readFileSync('./cacerts/private.key')*/"toRemove",
-			cert: /*fs.readFileSync('./cacerts/wildcard_newmips.crt')*/"toRemove",
+			key: /*fs.readFileSync('./cacerts/private.key')*/"fakeKey",
+			cert: /*fs.readFileSync('./cacerts/wildcard_newmips.crt')*/"fakeCert",
 			passphrase : ''
 		},
 		slack_chat_enabled: false
-	},
-	'cloud': {
-		env: 'cloud',
-		protocol: 'http',
-		protocol_iframe: 'https',
-		host: process.env.HOSTNAME,
-		dns: '.newmips.cloud',
-		port: process.env.PORT || 1337,
-		slack_chat_enabled: false
 	}
 }
 

diff --git a/config/slack.js b/config/slack.js
@@ -2,23 +2,23 @@ var globalConf = require('./global');
 
 var slack = {
 	develop: {
-		'SLACK_API_URL': 'https://slack.com/api/channels.join',
-		'SLACK_API_INVITE_URL': 'https://slack.com/api/channels.invite',
-		'SLACK_API_USER_TOKEN': '',
-		'SLACK_API_TOKEN': ''
+		SLACK_API_URL: 'https://slack.com/api/channels.join',
+		SLACK_API_INVITE_URL: 'https://slack.com/api/channels.invite',
+		SLACK_API_USER_TOKEN: '',
+		SLACK_API_TOKEN: ''
 	},
 	recette: {
-		'SLACK_API_URL': 'https://slack.com/api/channels.join',
-		'SLACK_API_INVITE_URL': 'https://slack.com/api/channels.invite',
-		'SLACK_API_USER_TOKEN': '',
-		'SLACK_API_TOKEN': ''
+		SLACK_API_URL: 'https://slack.com/api/channels.join',
+		SLACK_API_INVITE_URL: 'https://slack.com/api/channels.invite',
+		SLACK_API_USER_TOKEN: '',
+		SLACK_API_TOKEN: ''
 	},
 	production: {
-		'SLACK_API_URL': 'https://slack.com/api/channels.join',
-		'SLACK_API_INVITE_URL': 'https://slack.com/api/channels.invite',
-		'SLACK_API_USER_TOKEN': '',
-		'SLACK_API_TOKEN': ''
-	},
+		SLACK_API_URL: 'https://slack.com/api/channels.join',
+		SLACK_API_INVITE_URL: 'https://slack.com/api/channels.invite',
+		SLACK_API_USER_TOKEN: '',
+		SLACK_API_TOKEN: ''
+	}
 }
 
 module.exports = slack[globalConf.env];
diff --git a/database/application.js b/database/application.js
@@ -131,7 +131,7 @@ exports.deleteApplication = function(idApp, callback) {
 exports.listApplication = function(attr, callback) {
 
     models.Application.findAll({
-        order: "id DESC"
+        order: [["id", "DESC"]]
     }).then(function(applications){
         var info = {};
         info.message = "<br><ul>";