From 5df16f58ceb6739e9a428da46d6245d96d3f0e60 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 29 Oct 2017 16:05:22 +0100 Subject: [PATCH] Update data for Sandstorm. --- .sandstorm/sandstorm-files.list | 5 +++++ .sandstorm/setup.sh | 8 ++++++++ composer.lock | 20 ++++++++++---------- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index a4a711e45a..7c99137818 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -381,6 +381,7 @@ opt/app/app/Http/Middleware/Range.php opt/app/app/Http/Middleware/RedirectIfAuthenticated.php opt/app/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php opt/app/app/Http/Middleware/Sandstorm.php +opt/app/app/Http/Middleware/StartFireflySession.php opt/app/app/Http/Middleware/TrimStrings.php opt/app/app/Http/Middleware/TrustProxies.php opt/app/app/Http/Middleware/VerifyCsrfToken.php @@ -515,6 +516,7 @@ opt/app/app/Providers/RouteServiceProvider.php opt/app/app/Providers/RuleGroupServiceProvider.php opt/app/app/Providers/RuleServiceProvider.php opt/app/app/Providers/SearchServiceProvider.php +opt/app/app/Providers/SessionServiceProvider.php opt/app/app/Providers/TagServiceProvider.php opt/app/app/Repositories/Account/AccountRepository.php opt/app/app/Repositories/Account/AccountRepositoryInterface.php @@ -882,6 +884,8 @@ opt/app/public/js/lib/daterangepicker.js opt/app/public/js/lib/html5shiv.min.js opt/app/public/js/lib/jquery-3.1.1.min.js opt/app/public/js/lib/jquery-3.1.1.min.map +opt/app/public/js/lib/jquery-3.2.1.min.js +opt/app/public/js/lib/jquery-3.2.1.min.map opt/app/public/js/lib/jquery-ui.min.js opt/app/public/js/lib/jquery.color-2.1.2.min.js opt/app/public/js/lib/modernizr-custom.js @@ -1186,6 +1190,7 @@ opt/app/resources/views/index.twig opt/app/resources/views/javascript/accounts.twig opt/app/resources/views/javascript/currencies.twig opt/app/resources/views/javascript/variables.twig +opt/app/resources/views/json/piggy-banks.twig opt/app/resources/views/layout/default.twig opt/app/resources/views/layout/empty.twig opt/app/resources/views/layout/guest.twig diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh index 3745bdb6d2..6fe9839169 100755 --- a/.sandstorm/setup.sh +++ b/.sandstorm/setup.sh @@ -11,6 +11,14 @@ export DEBIAN_FRONTEND=noninteractive apt-get update apt-get install -y python-software-properties software-properties-common +# install all languages +sed -i 's/# nl_NL.UTF-8 UTF-8/nl_NL.UTF-8 UTF-8/g' /etc/locale.gen +sed -i 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/g' /etc/locale.gen +sed -i 's/# pt_BR.UTF-8 UTF-8/pt_BR.UTF-8 UTF-8/g' /etc/locale.gen +sed -i 's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/g' /etc/locale.gen +dpkg-reconfigure --frontend=noninteractive locales + + # actually add repository apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E9C74FEEA2098A6E add-apt-repository "deb http://packages.dotdeb.org jessie all" diff --git a/composer.lock b/composer.lock index 1b6c6a62f0..3aa3036e3b 100644 --- a/composer.lock +++ b/composer.lock @@ -788,16 +788,16 @@ }, { "name": "laravel/framework", - "version": "v5.5.18", + "version": "v5.5.19", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "1cc21baac11551377734b8c17ead17db4c34fe21" + "reference": "c678100e84934ec85c9f8bc26bd0a60222682719" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/1cc21baac11551377734b8c17ead17db4c34fe21", - "reference": "1cc21baac11551377734b8c17ead17db4c34fe21", + "url": "https://api.github.com/repos/laravel/framework/zipball/c678100e84934ec85c9f8bc26bd0a60222682719", + "reference": "c678100e84934ec85c9f8bc26bd0a60222682719", "shasum": "" }, "require": { @@ -915,7 +915,7 @@ "framework", "laravel" ], - "time": "2017-10-19T12:50:26+00:00" + "time": "2017-10-25T19:10:45+00:00" }, { "name": "laravelcollective/html", @@ -984,16 +984,16 @@ }, { "name": "league/commonmark", - "version": "0.15.6", + "version": "0.15.7", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "91742543c25fecedc84a4883d2919213e04a73b7" + "reference": "36d82f166e441dfa28643f8d01dd8bdd3a579adf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/91742543c25fecedc84a4883d2919213e04a73b7", - "reference": "91742543c25fecedc84a4883d2919213e04a73b7", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/36d82f166e441dfa28643f8d01dd8bdd3a579adf", + "reference": "36d82f166e441dfa28643f8d01dd8bdd3a579adf", "shasum": "" }, "require": { @@ -1049,7 +1049,7 @@ "markdown", "parser" ], - "time": "2017-08-08T11:47:33+00:00" + "time": "2017-10-26T15:41:07+00:00" }, { "name": "league/csv",