Merge branch 'beta' of github.com:CASES-LU/skeleton into beta

config/autoload/database.local.php.dist

@@ -0,0 +1,24 @@
+<?php
+
+return array(
+    'doctrine' => array(
+        'connection' => array(
+            'orm_default' => array(
+                'params' => array(
+                    'host' => '@db.host@',
+                    'user' => '@db.username@',
+                    'password' => '@db.password@',
+                    'dbname' => '@db.name@',
+                )
+            ),
+            'orm_cli' => array(
+                'params' => array(
+                    'host' => '@db.host@',
+                    'user' => '@db.username@',
+                    'password' => '@db.password@',
+                    'dbname' => '@db.name@',
+                )
+            )
+        )
+    )
+);

config/autoload/languages.local.php.dist

@@ -0,0 +1,30 @@
+<?php
+
+return array(
+    'languages' => [
+        1 => 'Français',
+        2 => 'English',
+        3 => 'Deutsch'
+    ],
+
+    'defaultLanguageIndex' => 1,
+
+    /* Link with (ModuleCore)
+    config['languages'] = [
+        'fr' => array(
+            'index' => 1,
+            'label' => 'Français'
+        ),
+        'en' => array(
+            'index' => 2,
+            'label' => 'English'
+        ),
+        'de' => array(
+            'index' => 3,
+            'label' => 'Deutsch'
+        ),
+    ]
+    */
+
+    'activeLanguages' => array('fr','en','de',)
+);

config/autoload/security-authentication.local.php.dist

@@ -0,0 +1,8 @@
+<?php
+
+return array(
+    'monarc' => array(
+        'ttl' => @monarc.ttl@,     // timeout
+        'salt' => '@monarc.salt@', // salt privé pour chiffrement pwd
+    ),
+);

package.json

@@ -5,8 +5,12 @@
   "private": true,
   "repository": {
     "type": "git",
-    "url": "ssh://gogs@rhea.netlor.fr:2222/monarc/skeleton.git"
+    "url": "https://github.com/CASES-LU/skeleton.git"
   },
   "author": "Netlor",
-  "license": "Copyright"
+  "license": "Copyright",
+  "devDependencies": {
+    "grunt": "~0.4.1",
+    "grunt-cli": "~0.1.13"
+  }
 }

scripts/compile_translations.sh

@@ -1,14 +1,16 @@
 #!/bin/bash
 
+pwd
+
 if [ -d node_modules/ng_backoffice ]; then
 	pushd node_modules/ng_backoffice
-	grunt compile_translations
+	node_modules/.bin/grunt compile_translations
-	grunt concat
+	node_modules/.bin/grunt concat
 fi
 
 
 if [ -d node_modules/ng_client ]; then
 	pushd node_modules/ng_client
-	grunt compile_translations
+	node_modules/.bin/grunt compile_translations
-	grunt concat
+	node_modules/.bin/grunt concat
 fi

scripts/extract_translations.sh

@@ -2,11 +2,11 @@
 
 if [ -d node_modules/ng_backoffice ]; then
 	pushd node_modules/ng_backoffice
-	grunt extract_translations
+	node_modules/.bin/grunt extract_translations
 fi
 
 
 if [ -d node_modules/ng_client ]; then
 	pushd node_modules/ng_client
-	grunt extract_translations
+	node_modules/.bin/grunt extract_translations
 fi

scripts/link_modules_resources.sh

@@ -59,7 +59,7 @@ if [ -d node_modules/ng_backoffice ]; then
 	cd ../..
 
 	pushd node_modules/ng_backoffice
-	grunt concat
+	node_modules/.bin/grunt concat
 	popd
 fi
 
@@ -90,7 +90,7 @@ if [ -d node_modules/ng_client ]; then
 	cd ../..
 
 	pushd node_modules/ng_client
-	grunt concat
+	node_modules/.bin/grunt concat
 	popd
 fi