diff --git a/VERSION.json b/VERSION.json index 8783494..7118989 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1 +1 @@ -{"major":2, "minor":9, "hotfix":1} +{"major":2, "minor":9, "hotfix":5} diff --git a/composer.lock b/composer.lock index a9a58d5..0d43508 100644 --- a/composer.lock +++ b/composer.lock @@ -1538,16 +1538,16 @@ }, { "name": "monarc/core", - "version": "2.9.3", + "version": "2.9.5", "source": { "type": "git", "url": "https://github.com/monarc-project/zm-core.git", - "reference": "5f2828c7051caf79827579516837b92b52773a76" + "reference": "2560489da136b04eeeb7d6ee597de3162a70397e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/5f2828c7051caf79827579516837b92b52773a76", - "reference": "5f2828c7051caf79827579516837b92b52773a76", + "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/2560489da136b04eeeb7d6ee597de3162a70397e", + "reference": "2560489da136b04eeeb7d6ee597de3162a70397e", "shasum": "" }, "require": { @@ -1619,7 +1619,7 @@ } ], "description": "Core for monarc/monarc application", - "time": "2019-12-09T10:56:13+00:00" + "time": "2019-12-18T15:59:18+00:00" }, { "name": "ocramius/package-versions", diff --git a/db-bootstrap/monarc_data.sql b/db-bootstrap/monarc_data.sql index bd08466..f5f0812 100755 --- a/db-bootstrap/monarc_data.sql +++ b/db-bootstrap/monarc_data.sql @@ -50,7 +50,7 @@ UNLOCK TABLES; LOCK TABLES `anrs_objects_categories` WRITE; /*!40000 ALTER TABLE `anrs_objects_categories` DISABLE KEYS */; -INSERT INTO `anrs_objects_categories` VALUES (1,8,1,1,NULL,'2017-01-18 17:27:37',NULL,NULL),(2,9,1,1,NULL,'2017-01-18 17:27:38',NULL,NULL),(3,7,1,1,NULL,'2017-01-18 17:27:39',NULL,NULL),(4,10,1,1,NULL,'2017-01-18 17:27:40',NULL,NULL),(5,8,3,2,NULL,'2017-01-18 17:27:55',NULL,NULL),(6,10,2,2,NULL,'2017-01-18 17:29:45',NULL,NULL),(7,9,2,2,NULL,'2017-01-18 17:29:55',NULL,NULL),(8,7,2,2,NULL,'2017-01-18 17:29:57',NULL,NULL),(9,7,5,3,NULL,'2017-01-18 17:30:19',NULL,NULL),(10,10,5,3,NULL,'2017-01-18 17:30:39',NULL,NULL),(11,13,33,1,NULL,'2017-01-19 09:50:24',NULL,NULL),(12,14,33,1,NULL,'2017-01-19 09:50:25',NULL,NULL),(13,12,33,1,NULL,'2017-01-19 09:50:26',NULL,NULL),(14,15,33,1,NULL,'2017-01-19 09:50:28',NULL,NULL),(15,13,35,2,NULL,'2017-01-19 09:50:46',NULL,NULL),(16,15,34,2,NULL,'2017-01-19 09:52:53',NULL,NULL),(17,14,34,2,NULL,'2017-01-19 09:53:04',NULL,NULL),(18,12,34,2,NULL,'2017-01-19 09:53:05',NULL,NULL),(19,12,37,3,NULL,'2017-01-19 09:53:25',NULL,NULL),(20,15,37,3,NULL,'2017-01-19 09:53:46',NULL,NULL),(21,18,65,1,NULL,'2017-01-19 10:17:25',NULL,NULL),(22,19,65,1,NULL,'2017-01-19 10:17:26',NULL,NULL),(23,17,65,1,NULL,'2017-01-19 10:17:27',NULL,NULL),(24,20,65,1,NULL,'2017-01-19 10:17:28',NULL,NULL),(25,18,67,2,NULL,'2017-01-19 10:17:43',NULL,NULL),(26,20,66,2,NULL,'2017-01-19 10:19:33',NULL,NULL),(27,19,66,2,NULL,'2017-01-19 10:19:42',NULL,NULL),(28,17,66,2,NULL,'2017-01-19 10:19:43',NULL,NULL),(29,17,69,3,NULL,'2017-01-19 10:20:01',NULL,NULL),(30,20,69,3,NULL,'2017-01-19 10:20:22',NULL,NULL),(31,23,97,1,NULL,'2017-01-19 10:44:27',NULL,NULL),(32,24,97,1,NULL,'2017-01-19 10:44:28',NULL,NULL),(33,22,97,1,NULL,'2017-01-19 10:44:29',NULL,NULL),(34,25,97,1,NULL,'2017-01-19 10:44:31',NULL,NULL),(35,23,99,2,NULL,'2017-01-19 10:44:48',NULL,NULL),(36,25,98,2,NULL,'2017-01-19 10:46:59',NULL,NULL),(37,24,98,2,NULL,'2017-01-19 10:47:11',NULL,NULL),(38,22,98,2,NULL,'2017-01-19 10:47:12',NULL,NULL),(39,22,101,3,NULL,'2017-01-19 10:47:32',NULL,NULL),(40,25,101,3,NULL,'2017-01-19 10:47:52',NULL,NULL),(41,28,129,1,NULL,'2017-01-19 11:39:10',NULL,NULL),(42,29,129,1,NULL,'2017-01-19 11:39:11',NULL,NULL),(43,27,129,1,NULL,'2017-01-19 11:39:12',NULL,NULL),(44,30,129,1,NULL,'2017-01-19 11:39:14',NULL,NULL),(45,28,131,2,NULL,'2017-01-19 11:39:30',NULL,NULL),(46,30,130,2,NULL,'2017-01-19 11:41:25',NULL,NULL),(47,29,130,2,NULL,'2017-01-19 11:41:34',NULL,NULL),(48,27,130,2,NULL,'2017-01-19 11:41:35',NULL,NULL),(49,27,133,3,NULL,'2017-01-19 11:41:54',NULL,NULL),(50,30,133,3,NULL,'2017-01-19 11:42:14',NULL,NULL),(67,43,161,1,NULL,'2017-02-28 12:53:51',NULL,NULL),(68,43,162,2,NULL,'2017-02-28 12:54:13',NULL,NULL); +INSERT INTO `anrs_objects_categories` VALUES (67,43,161,1,NULL,'2017-02-28 12:53:51',NULL,NULL),(68,43,162,2,NULL,'2017-02-28 12:54:13',NULL,NULL); /*!40000 ALTER TABLE `anrs_objects_categories` ENABLE KEYS */; UNLOCK TABLES; diff --git a/package.json b/package.json index 3c72577..00dbf68 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "MONARC", - "version": "2.9.4", + "version": "2.9.5", "description": "Monarc back office", "private": true, "repository": {