Released 2.2.2

Updated dependencies
Merge pull request #1733 from CachetHQ/2.2-rebuild-assets
2026-03-06 01:07:01 +00:00 · 2016-04-29 16:58:08 +01:00 · 2016-04-29 16:54:08 +01:00 · 2016-04-29 16:48:22 +01:00 · 2016-04-29 16:45:06 +01:00 · 2016-04-27 14:50:31 +01:00
13 changed files with 165 additions and 145 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-2.2.1
+2.2.2
--- a/app/Config/Repository.php
+++ b/app/Config/Repository.php
@@ -70,6 +70,20 @@ class Repository
        }
    }

+    /**
+     * Deletes a setting.
+     *
+     * @param string $name
+     *
+     * @return void
+     */
+    public function delete($name)
+    {
+        $this->stale = true;
+
+        $this->model->where('name', $name)->delete();
+    }
+
    /**
     * Is the config state stale?
     *
--- a/app/Foundation/Providers/RouteServiceProvider.php
+++ b/app/Foundation/Providers/RouteServiceProvider.php
@@ -17,7 +17,7 @@ use Illuminate\Routing\Router;
 class RouteServiceProvider extends ServiceProvider
 {
    /**
-     * This namespace is applied to the controller routes in your routes file.
+     * This namespace is applied to your controller routes.
     *
     * In addition, it is set as the URL generator's root namespace.
     *
--- a/app/Http/Controllers/Dashboard/SettingsController.php
+++ b/app/Http/Controllers/Dashboard/SettingsController.php
@@ -19,6 +19,7 @@ use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Str;
 use Illuminate\Support\Facades\View;

 class SettingsController extends Controller
@@ -225,12 +226,22 @@ class SettingsController extends Controller
            $setting->set('app_banner', null);
        }

-        if ($header = Binput::get('header', null, false, false)) {
-            $setting->set('header', $header);
+        $parameters = Binput::all();
+
+        if (isset($parameters['header'])) {
+            if ($header = Binput::get('header', null, false, false)) {
+                $setting->set('header', $header);
+            } else {
+                $setting->delete('header');
+            }
        }

-        if ($footer = Binput::get('footer', null, false, false)) {
-            $setting->set('footer', $footer);
+        if (isset($parameters['footer'])) {
+            if ($footer = Binput::get('footer', null, false, false)) {
+                $setting->set('footer', $footer);
+            } else {
+                $setting->delete('footer');
+            }
        }

        if (Binput::hasFile('app_banner')) {
@@ -248,7 +259,7 @@ class SettingsController extends Controller
                return Redirect::to($redirectUrl)->withErrors($file->getErrorMessage());
            }

-            if (!starts_with($file->getMimeType(), 'image/')) {
+            if (!Str::startsWith($file->getMimeType(), 'image/')) {
                return Redirect::to($redirectUrl)->withErrors(trans('dashboard.settings.app-setup.images-only'));
            }

--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
    ],
    "require": {
        "php": ">=5.5.9",
-        "laravel/framework": "~5.2.30",
+        "laravel/framework": "~5.2.31",
        "alt-three/badger": "^3.0",
        "alt-three/bus": "^1.0",
        "alt-three/emoji": "^3.0",
--- a/composer.lock
+++ b/composer.lock
@@ -4,26 +4,26 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
-    "hash": "a14ab9a0890f81633658517822f88207",
-    "content-hash": "dd1a2ca8d28210dce24ed73872fd2449",
+    "hash": "901c99e979e07b62141b501945ccc8d3",
+    "content-hash": "805d1e0e24e031f66f54ba66d3436274",
    "packages": [
        {
            "name": "alt-three/badger",
-            "version": "v3.0.0",
+            "version": "v3.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/AltThree/Badger.git",
-                "reference": "a39c10501443dc7a1197a7a75884ebdd5aeb2691"
+                "reference": "c5de4afcefcc0dd6576d2ae4bd5d5e83fb0cb8d9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/AltThree/Badger/zipball/a39c10501443dc7a1197a7a75884ebdd5aeb2691",
-                "reference": "a39c10501443dc7a1197a7a75884ebdd5aeb2691",
+                "url": "https://api.github.com/repos/AltThree/Badger/zipball/c5de4afcefcc0dd6576d2ae4bd5d5e83fb0cb8d9",
+                "reference": "c5de4afcefcc0dd6576d2ae4bd5d5e83fb0cb8d9",
                "shasum": ""
            },
            "require": {
-                "illuminate/contracts": "5.1.*|5.2.*",
-                "illuminate/support": "5.1.*|5.2.*",
+                "illuminate/contracts": "5.1.*|5.2.*|5.3.*",
+                "illuminate/support": "5.1.*|5.2.*|5.3.*",
                "php": ">=5.5.9"
            },
            "require-dev": {
@@ -33,7 +33,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                }
            },
            "autoload": {
@@ -67,27 +67,27 @@
                "shield",
                "svg"
            ],
-            "time": "2016-02-20 16:48:04"
+            "time": "2016-04-22 17:23:42"
        },
        {
            "name": "alt-three/bus",
-            "version": "v1.0.2",
+            "version": "v1.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/AltThree/Bus.git",
-                "reference": "a7a3bc76c66643624b072d551ca0fe31008d3f80"
+                "reference": "5c8399e0ca67ba6b499aa1e8db6a278711446090"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/AltThree/Bus/zipball/a7a3bc76c66643624b072d551ca0fe31008d3f80",
-                "reference": "a7a3bc76c66643624b072d551ca0fe31008d3f80",
+                "url": "https://api.github.com/repos/AltThree/Bus/zipball/5c8399e0ca67ba6b499aa1e8db6a278711446090",
+                "reference": "5c8399e0ca67ba6b499aa1e8db6a278711446090",
                "shasum": ""
            },
            "require": {
-                "illuminate/container": "5.2.*",
-                "illuminate/contracts": "5.2.*",
-                "illuminate/pipeline": "5.2.*",
-                "illuminate/support": "5.2.*",
+                "illuminate/container": "5.2.*|5.3.*",
+                "illuminate/contracts": "5.2.*|5.3.*",
+                "illuminate/pipeline": "5.2.*|5.3.*",
+                "illuminate/support": "5.2.*|5.3.*",
                "php": ">=5.5.9"
            },
            "require-dev": {
@@ -98,7 +98,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "1.1-dev"
                }
            },
            "autoload": {
@@ -128,7 +128,7 @@
                    "email": "joe@alt-three.com"
                }
            ],
-            "description": "An improved command bus for Laravel 5.2",
+            "description": "An improved command bus for Laravel 5.2+",
            "keywords": [
                "Alt Three",
                "bus",
@@ -136,26 +136,26 @@
                "command bus",
                "job"
            ],
-            "time": "2016-01-24 10:52:16"
+            "time": "2016-04-22 17:24:19"
        },
        {
            "name": "alt-three/emoji",
-            "version": "v3.0.1",
+            "version": "v3.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/AltThree/Emoji.git",
-                "reference": "7504b09d6979c9d22a7f1ef70c9e7181d99f2305"
+                "reference": "631119fb03162af8f42f7eda4c1f92c87611e36f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/AltThree/Emoji/zipball/7504b09d6979c9d22a7f1ef70c9e7181d99f2305",
-                "reference": "7504b09d6979c9d22a7f1ef70c9e7181d99f2305",
+                "url": "https://api.github.com/repos/AltThree/Emoji/zipball/631119fb03162af8f42f7eda4c1f92c87611e36f",
+                "reference": "631119fb03162af8f42f7eda4c1f92c87611e36f",
                "shasum": ""
            },
            "require": {
                "guzzlehttp/guzzle": "^5.3|^6.0",
-                "illuminate/contracts": "5.1.*|5.2.*",
-                "illuminate/support": "5.1.*|5.2.*",
+                "illuminate/contracts": "5.1.*|5.2.*|5.3.*",
+                "illuminate/support": "5.1.*|5.2.*|5.3.*",
                "league/commonmark": "^0.13",
                "php": ">=5.5.9"
            },
@@ -167,7 +167,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                }
            },
            "autoload": {
@@ -199,25 +199,25 @@
                "emoji",
                "parser"
            ],
-            "time": "2016-01-24 10:52:39"
+            "time": "2016-04-22 17:24:35"
        },
        {
            "name": "alt-three/validator",
-            "version": "v1.4.1",
+            "version": "v1.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/AltThree/Validator.git",
-                "reference": "9845766276479bac04439390ea91817c5b2dbda8"
+                "reference": "fbfe733bac9614edc2c09f8dea7ee3ce465402bb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/AltThree/Validator/zipball/9845766276479bac04439390ea91817c5b2dbda8",
-                "reference": "9845766276479bac04439390ea91817c5b2dbda8",
+                "url": "https://api.github.com/repos/AltThree/Validator/zipball/fbfe733bac9614edc2c09f8dea7ee3ce465402bb",
+                "reference": "fbfe733bac9614edc2c09f8dea7ee3ce465402bb",
                "shasum": ""
            },
            "require": {
-                "illuminate/contracts": "5.1.*|5.2.*",
-                "illuminate/support": "5.1.*|5.2.*",
+                "illuminate/contracts": "5.1.*|5.2.*|5.3.*",
+                "illuminate/support": "5.1.*|5.2.*|5.3.*",
                "php": ">=5.5.9",
                "psr/log": "^1.0"
            },
@@ -227,7 +227,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.5-dev"
                }
            },
            "autoload": {
@@ -259,7 +259,7 @@
                "logging",
                "validator"
            ],
-            "time": "2016-01-03 10:46:21"
+            "time": "2016-04-22 17:26:22"
        },
        {
            "name": "bacon/bacon-qr-code",
@@ -1019,23 +1019,23 @@
        },
        {
            "name": "graham-campbell/binput",
-            "version": "v3.3.1",
+            "version": "v3.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/GrahamCampbell/Laravel-Binput.git",
-                "reference": "d54f3a9bdd11e5006e58cf58167450f02c9298b7"
+                "reference": "814bcce1c012fbdf3a8275eef45e5d84ad01239d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Binput/zipball/d54f3a9bdd11e5006e58cf58167450f02c9298b7",
-                "reference": "d54f3a9bdd11e5006e58cf58167450f02c9298b7",
+                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Binput/zipball/814bcce1c012fbdf3a8275eef45e5d84ad01239d",
+                "reference": "814bcce1c012fbdf3a8275eef45e5d84ad01239d",
                "shasum": ""
            },
            "require": {
                "graham-campbell/security": "^3.5",
-                "illuminate/contracts": "5.1.*|5.2.*",
-                "illuminate/http": "5.1.*|5.2.*",
-                "illuminate/support": "5.1.*|5.2.*",
+                "illuminate/contracts": "5.1.*|5.2.*|5.3.*",
+                "illuminate/http": "5.1.*|5.2.*|5.3.*",
+                "illuminate/support": "5.1.*|5.2.*|5.3.*",
                "php": ">=5.5.9"
            },
            "require-dev": {
@@ -1046,7 +1046,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                }
            },
            "autoload": {
@@ -1078,26 +1078,26 @@
                "laravel",
                "security"
            ],
-            "time": "2016-01-30 14:14:26"
+            "time": "2016-04-26 14:18:44"
        },
        {
            "name": "graham-campbell/core",
-            "version": "v4.2.1",
+            "version": "v4.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/GrahamCampbell/Laravel-Core.git",
-                "reference": "487ff7e670a8ba5ecea907ada62e4714ac87fdb8"
+                "reference": "feb7c112bf09a7a01b12695ed9d81700be8f59f1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Core/zipball/487ff7e670a8ba5ecea907ada62e4714ac87fdb8",
-                "reference": "487ff7e670a8ba5ecea907ada62e4714ac87fdb8",
+                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Core/zipball/feb7c112bf09a7a01b12695ed9d81700be8f59f1",
+                "reference": "feb7c112bf09a7a01b12695ed9d81700be8f59f1",
                "shasum": ""
            },
            "require": {
-                "illuminate/console": "5.1.*|5.2.*",
-                "illuminate/contracts": "5.1.*|5.2.*",
-                "illuminate/support": "5.1.*|5.2.*",
+                "illuminate/console": "5.1.*|5.2.*|5.3.*",
+                "illuminate/contracts": "5.1.*|5.2.*|5.3.*",
+                "illuminate/support": "5.1.*|5.2.*|5.3.*",
                "php": ">=5.5.9"
            },
            "require-dev": {
@@ -1108,7 +1108,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "4.2-dev"
+                    "dev-master": "4.3-dev"
                }
            },
            "autoload": {
@@ -1138,26 +1138,26 @@
                "laravel",
                "starter"
            ],
-            "time": "2016-01-30 14:13:27"
+            "time": "2016-04-26 14:18:59"
        },
        {
            "name": "graham-campbell/exceptions",
-            "version": "v8.3.6",
+            "version": "v8.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/GrahamCampbell/Laravel-Exceptions.git",
-                "reference": "f859c87213121f0e5b6a06fb7bee246b5b597990"
+                "reference": "91eacead72ec6c02bb231e3ed401bc228271fa74"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/f859c87213121f0e5b6a06fb7bee246b5b597990",
-                "reference": "f859c87213121f0e5b6a06fb7bee246b5b597990",
+                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/91eacead72ec6c02bb231e3ed401bc228271fa74",
+                "reference": "91eacead72ec6c02bb231e3ed401bc228271fa74",
                "shasum": ""
            },
            "require": {
-                "illuminate/contracts": "5.1.*|5.2.*",
-                "illuminate/support": "5.1.*|5.2.*",
-                "paragonie/random_compat": "^1.1",
+                "illuminate/contracts": "5.1.*|5.2.*|5.3.*",
+                "illuminate/support": "5.1.*|5.2.*|5.3.*",
+                "paragonie/random_compat": "^1.1|^2.0",
                "php": ">=5.5.9",
                "psr/log": "^1.0",
                "symfony/debug": "^2.7|^3.0",
@@ -1175,7 +1175,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "8.3-dev"
+                    "dev-master": "8.4-dev"
                }
            },
            "autoload": {
@@ -1207,26 +1207,26 @@
                "laravel",
                "whoops"
            ],
-            "time": "2016-03-27 18:46:09"
+            "time": "2016-04-26 14:23:03"
        },
        {
            "name": "graham-campbell/markdown",
-            "version": "v6.0.1",
+            "version": "v6.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/GrahamCampbell/Laravel-Markdown.git",
-                "reference": "29e4f49b40a3b588cc6154d4e5e2df90d89fd898"
+                "reference": "2208ec910d9880d6bca28d332ae7f3b7350355d1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Markdown/zipball/29e4f49b40a3b588cc6154d4e5e2df90d89fd898",
-                "reference": "29e4f49b40a3b588cc6154d4e5e2df90d89fd898",
+                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Markdown/zipball/2208ec910d9880d6bca28d332ae7f3b7350355d1",
+                "reference": "2208ec910d9880d6bca28d332ae7f3b7350355d1",
                "shasum": ""
            },
            "require": {
-                "illuminate/contracts": "5.1.*|5.2.*",
-                "illuminate/support": "5.1.*|5.2.*",
-                "illuminate/view": "5.1.*|5.2.*",
+                "illuminate/contracts": "5.1.*|5.2.*|5.3.*",
+                "illuminate/support": "5.1.*|5.2.*|5.3.*",
+                "illuminate/view": "5.1.*|5.2.*|5.3.*",
                "league/commonmark": "^0.13",
                "php": ">=5.5.9"
            },
@@ -1239,7 +1239,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "6.0-dev"
+                    "dev-master": "6.1-dev"
                }
            },
            "autoload": {
@@ -1269,25 +1269,25 @@
                "laravel",
                "markdown"
            ],
-            "time": "2016-01-30 14:29:18"
+            "time": "2016-04-26 14:28:21"
        },
        {
            "name": "graham-campbell/security",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/GrahamCampbell/Laravel-Security.git",
-                "reference": "60292252e7fe1ebe1ea48dbc6b2162a51602c6ab"
+                "reference": "07d4ec2658582032afe225928bde883474e2a543"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Security/zipball/60292252e7fe1ebe1ea48dbc6b2162a51602c6ab",
-                "reference": "60292252e7fe1ebe1ea48dbc6b2162a51602c6ab",
+                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Security/zipball/07d4ec2658582032afe225928bde883474e2a543",
+                "reference": "07d4ec2658582032afe225928bde883474e2a543",
                "shasum": ""
            },
            "require": {
-                "illuminate/contracts": "5.1.*|5.2.*",
-                "illuminate/support": "5.1.*|5.2.*",
+                "illuminate/contracts": "5.1.*|5.2.*|5.3.*",
+                "illuminate/support": "5.1.*|5.2.*|5.3.*",
                "php": ">=5.5.9"
            },
            "require-dev": {
@@ -1297,7 +1297,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "3.5-dev"
+                    "dev-master": "3.6-dev"
                }
            },
            "autoload": {
@@ -1326,7 +1326,7 @@
                "laravel",
                "security"
            ],
-            "time": "2016-01-30 14:22:10"
+            "time": "2016-04-26 14:29:04"
        },
        {
            "name": "guzzlehttp/guzzle",
@@ -1703,16 +1703,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v5.2.30",
+            "version": "v5.2.31",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "ecfbbfbf96105439cc9a40bc78277bdb0268e34d"
+                "reference": "2fa2797604bf54b06faf7bb139a9fc0d66826fea"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/ecfbbfbf96105439cc9a40bc78277bdb0268e34d",
-                "reference": "ecfbbfbf96105439cc9a40bc78277bdb0268e34d",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/2fa2797604bf54b06faf7bb139a9fc0d66826fea",
+                "reference": "2fa2797604bf54b06faf7bb139a9fc0d66826fea",
                "shasum": ""
            },
            "require": {
@@ -1828,7 +1828,7 @@
                "framework",
                "laravel"
            ],
-            "time": "2016-04-19 19:12:18"
+            "time": "2016-04-27 13:02:09"
        },
        {
            "name": "league/commonmark",
@@ -1900,16 +1900,16 @@
        },
        {
            "name": "league/flysystem",
-            "version": "1.0.21",
+            "version": "1.0.22",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "35a83cf67d80d7040f306c77b0a84b9fbcc4fbfb"
+                "reference": "bd73a91703969a2d20ab4bfbf971d6c2cbe36612"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/35a83cf67d80d7040f306c77b0a84b9fbcc4fbfb",
-                "reference": "35a83cf67d80d7040f306c77b0a84b9fbcc4fbfb",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/bd73a91703969a2d20ab4bfbf971d6c2cbe36612",
+                "reference": "bd73a91703969a2d20ab4bfbf971d6c2cbe36612",
                "shasum": ""
            },
            "require": {
@@ -1979,7 +1979,7 @@
                "sftp",
                "storage"
            ],
-            "time": "2016-04-22 10:56:25"
+            "time": "2016-04-28 06:53:12"
        },
        {
            "name": "mccool/laravel-auto-presenter",
@@ -3812,33 +3812,29 @@
        },
        {
            "name": "fzaninotto/faker",
-            "version": "v1.5.0",
+            "version": "v1.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "d0190b156bcca848d401fb80f31f504f37141c8d"
+                "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d0190b156bcca848d401fb80f31f504f37141c8d",
-                "reference": "d0190b156bcca848d401fb80f31f504f37141c8d",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123",
+                "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.3.3"
+                "php": "^5.3.3|^7.0"
            },
            "require-dev": {
+                "ext-intl": "*",
                "phpunit/phpunit": "~4.0",
                "squizlabs/php_codesniffer": "~1.5"
            },
-            "suggest": {
-                "ext-intl": "*"
-            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5.x-dev"
-                }
+                "branch-alias": []
            },
            "autoload": {
                "psr-4": {
@@ -3860,7 +3856,7 @@
                "faker",
                "fixtures"
            ],
-            "time": "2015-05-29 06:29:14"
+            "time": "2016-04-29 12:21:54"
        },
        {
            "name": "graham-campbell/testbench-core",
--- a/public/build/dist/css/all-5d444fe92b.css
+++ b/public/build/dist/css/all-5d444fe92b.css
--- a/public/build/dist/css/all-ecafd6395d.css
+++ b/public/build/dist/css/all-ecafd6395d.css
--- a/public/build/dist/js/all-a62567215d.js
+++ b/public/build/dist/js/all-a62567215d.js
--- a/public/build/rev-manifest.json
+++ b/public/build/rev-manifest.json
@@ -1,4 +1,4 @@
 {
-  "dist/css/all.css": "dist/css/all-5d444fe92b.css",
-  "dist/js/all.js": "dist/js/all-98b897c006.js"
+  "dist/css/all.css": "dist/css/all-ecafd6395d.css",
+  "dist/js/all.js": "dist/js/all-a62567215d.js"
 }
--- a/resources/assets/sass/app.scss
+++ b/resources/assets/sass/app.scss
@@ -9,6 +9,9 @@ html {
    position: relative;
    min-height: 100%;
    -webkit-font-smoothing: antialiased;
+    // always show up-down scrollbar to prevent content from jumping left/right
+    // depending on whether the page is taller than 100% of viewport height
+    overflow-y: scroll;
 }

 body {
--- a/resources/views/dashboard/settings/localization.blade.php
+++ b/resources/views/dashboard/settings/localization.blade.php
@@ -64,9 +64,9 @@
                                        <label>{{ trans('forms.settings.localization.site-locale') }}</label>
                                        <select name="app_locale" class="form-control" required>
                                            <option value="">Select Language</option>
-                                            @foreach($langs as $lang => $name)
-                                                <option value="{{ $lang }}" @if($app_locale === $lang) selected @endif>
-                                                    {{ $name }}
+                                            @foreach($langs as $key => $lang)
+                                                <option value="{{ $key }}" @if($app_locale === $key) selected @endif>
+                                                    {{ $lang['name'] }}
                                                </option>
                                            @endforeach
                                        </select>
--- a/resources/views/subscribe/signup.blade.php
+++ b/resources/views/subscribe/signup.blade.php
Author	SHA1	Message	Date
Graham Campbell	f79fadab80	Released 2.2.2	2016-04-29 16:58:08 +01:00
Graham Campbell	e3dc7594e5	Updated dependencies	2016-04-29 16:54:08 +01:00
Graham Campbell	200771cdab	Merge pull request #1733 from CachetHQ/2.2-rebuild-assets Rebuild assets	2016-04-29 16:48:22 +01:00
James Brooks	56760c7445	Rebuild assets	2016-04-29 16:45:06 +01:00
Graham Campbell	65ebfde315	Merge pull request #1729 from CachetHQ/fix-removal-customizations Fixes removal of Customization values	2016-04-27 14:50:31 +01:00
Graham Campbell	4f7c50f7f4	Updated laravel	2016-04-27 14:49:37 +01:00
James Brooks	de232ab2b5	Fixes removal of Customization values	2016-04-27 14:47:47 +01:00
James Brooks	067018cf47	Use the Str facade	2016-04-27 14:37:17 +01:00
Graham Campbell	97e5fa07fa	Updated dependencies	2016-04-27 09:41:39 +01:00
James Brooks	dec48a92f3	Merge pull request #1726 from alprs/fix-always_show_scrollbar Always show vertical scrollbar	2016-04-27 09:28:58 +01:00
Andreas Lutro	0672fe046e	Always show vertical scrollbar	2016-04-27 10:14:14 +02:00
James Brooks	b78009bee4	Merge pull request #1725 from alprs/fix-settings_localization_error Fix a PHP error in settings -> localization	2016-04-27 08:56:56 +01:00
James Brooks	5907f54201	Merge pull request #1722 from alprs/fix-view_signup_notfound Fix location of signup template	2016-04-27 08:56:07 +01:00
Andreas Lutro	555865d761	Fix a PHP error in settings -> localization $langs is a nested array, not an array of strings. Fixes #1723	2016-04-27 09:34:59 +02:00
Andreas Lutro	c0561ad8c0	fix location of signup template fixes #1668	2016-04-27 09:00:05 +02:00
Graham Campbell	ef8049c21d	Updated laravel	2016-04-25 15:56:50 +01:00
Graham Campbell	cf80bf31f3	Synced with laravel/laravel	2016-04-25 15:25:52 +01:00
Graham Campbell	cf900e1390	Back to dev	2016-04-23 11:03:33 +01:00
@@ -1 +1 @@
 .2.1
 .2.2