Merge pull request #388 from xibosignage/release18

Release 1.8.10
xibosignage · Jul 4, 2018 · 1eaf396 · 1eaf396
2 parents a3c92a0 + 59ec509
commit 1eaf396
Show file tree

Hide file tree

Showing 420 changed files with 25,918 additions and 11,767 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -99,7 +99,7 @@ RUN sed -i "s/error_reporting = .*$/error_reporting = E_ERROR | E_WARNING | E_PA
 # Setup persistent environment variables
 ENV CMS_DEV_MODE=false \
     XMR_HOST=xmr \
-    CMS_DB_VERSION=140 \
+    CMS_DB_VERSION=141 \
     CMS_SERVER_NAME=localhost \
     MYSQL_HOST=mysql \
     MYSQL_USER=cms \

diff --git a/bin/run.php b/bin/run.php
@@ -83,8 +83,8 @@
 
 \Xibo\Middleware\Storage::setStorage($app->container);
 \Xibo\Middleware\State::setState($app);
-$app->configService->loadTheme();
 
+$app->add(new \Xibo\Middleware\Xtr());
 $app->add(new \Xibo\Middleware\Storage());
 $app->add(new \Xibo\Middleware\Xmr());
 

diff --git a/composer.json b/composer.json
@@ -68,7 +68,8 @@
     "illuminate/cache": "5.2.*",
     "xibosignage/oauth2-xibo-cms": "^1.1",
     "mtdowling/cron-expression": "^1.1",
-    "ralouphie/mimey": "^1.0"
+    "ralouphie/mimey": "^1.0",
+    "johngrogg/ics-parser": "^2.1"
   },
   "require-dev": {
     "php": ">=7",