Merge branch 'master' of https://github.com/monarc-project/MonarcAppFO

config/autoload/local.php.dist

@@ -75,13 +75,13 @@ return array(
             'index' => 3,
             'label' => 'Deutsch'
         ),
-        'ne' => array(
+        'nl' => array(
             'index' => 4,
             'label' => 'Nederlands',
         ),
     ]
     */
-    'activeLanguages' => array('fr','en','de','ne',),
+    'activeLanguages' => array('fr','en','de','nl',),
 
     'appVersion' => $package_json['version'],
 

package.json

@@ -14,7 +14,7 @@
     "ng_client": "https://github.com/monarc-project/ng-client#master"
   },
   "devDependencies": {
-    "grunt": "~0.4.1",
+    "grunt": "~1.0.3",
-    "grunt-cli": "~0.1.13"
+    "grunt-cli": "~1.3.2"
   }
 }

packages.json

@@ -1,30 +0,0 @@
-{
-    "packages": {
-        "monarc/skeleton": {
-            "dev-master": {
-            "name": "monarc/skeleton",
-            "type": "library",
-            "version": "dev-master",
-            "description": "Skeleton for Monarc project",
-            "authors": [
-                {"name": "Cyril Rouyer", "email": "cyril@netlor.fr"},
-                {"name": "Guillaume Lesniak", "email": "guillaume@netlor.fr"},
-                {"name": "Jerôme De Almeida", "email": "jerome.dealmeida@vesperiagroup.com"},
-                {"name": "Benjamin Ganivet", "email": "benjamin@netlor.fr"},
-                {"name": "Thomas Metois", "email": "thomas@netlor.fr"},
-                {"name": "Jérôme Lombardi", "email": "jerome.lombardi@cases.lu"},
-                {"name": "Juan Rocha", "email": "juan.rocha@cases.lu"},
-                {"name": "Cédric Bonhomme", "email": "cedric.bonhomme@cases.lu"}
-            ],
-            "require": {
-                "php": ">=5.5"
-            },
-            "source": {
-                "url": "https://github.com/monarc-project/skeleton",
-                "type": "git",
-                "reference": "master"
-            }
-        }
-        }
-    }
-}