Compare commits

..

11 Commits

Author SHA1 Message Date
Graham Campbell
d559c47aa0 Released 2.0.3 2015-12-02 22:23:44 +00:00
Graham Campbell
ff91bc4de3 Updated dependencies 2015-12-02 22:21:45 +00:00
Graham Campbell
4be7dc9635 Updated laravel 2015-12-02 22:17:36 +00:00
Graham Campbell
ce279202c8 Fixed phpdoc 2015-11-30 16:03:26 +00:00
phecho
b25db21444 Fixed wrong var
Closes #1191

Signed-off-by: Graham Campbell <graham@alt-three.com>
2015-11-30 16:03:14 +00:00
James Brooks
a35430a4fd Fixes a bug with dashboard_login_link setting. Fixes #1190 2015-11-29 15:37:24 +00:00
James Brooks
1c4d7f4be3 Updated dependencies 2015-11-28 16:32:15 +00:00
Graham Campbell
73d1a989ec Updated dependencies 2015-11-27 10:28:06 +00:00
James Brooks
413abe4446 Merge pull request #1185 from cachethq/elixir-4
Upgrade to elixir 4 and rebuild assets
2015-11-27 09:55:18 +00:00
Joseph Cohen
41238611b6 Upgrade to elixir 4 and rebuild assets 2015-11-27 03:15:44 -06:00
James Brooks
83fd397818 Back to dev version 2015-11-26 13:48:05 +00:00
11 changed files with 91 additions and 93 deletions

View File

@@ -1 +1 @@
2.0.2
2.0.3

View File

@@ -16,9 +16,9 @@ final class InviteTeamMemberCommand
/**
* The invte emails.
*
* @var string
* @var string[]
*/
public $email;
public $emails;
/**
* The validation rules.

View File

@@ -20,7 +20,7 @@
],
"require": {
"php": ">=5.5.9",
"laravel/framework": "~5.1.24",
"laravel/framework": "~5.1.26",
"alt-three/emoji": "^2.1",
"alt-three/validator": "^1.4",
"barryvdh/laravel-cors": "^0.7",

92
composer.lock generated
View File

@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "52036c1c441764199c64feae792eaf43",
"content-hash": "739bbddba8a0a28e8e4a1ec8a0e47e44",
"hash": "68368056b2e111808dc9fde989b5324d",
"content-hash": "976eda704e6a191e2bd557cb919f1ed6",
"packages": [
{
"name": "alt-three/emoji",
@@ -1611,16 +1611,16 @@
},
{
"name": "jenssegers/date",
"version": "v3.0.10",
"version": "v3.0.12",
"source": {
"type": "git",
"url": "https://github.com/jenssegers/date.git",
"reference": "467278308153eb27048e471213366193587d87a0"
"reference": "2e423f6327cbf72a41fd6bac094a788bc524a863"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jenssegers/date/zipball/467278308153eb27048e471213366193587d87a0",
"reference": "467278308153eb27048e471213366193587d87a0",
"url": "https://api.github.com/repos/jenssegers/date/zipball/2e423f6327cbf72a41fd6bac094a788bc524a863",
"reference": "2e423f6327cbf72a41fd6bac094a788bc524a863",
"shasum": ""
},
"require": {
@@ -1663,7 +1663,7 @@
"time",
"translation"
],
"time": "2015-09-24 17:36:06"
"time": "2015-10-26 15:04:00"
},
{
"name": "jeremeamia/SuperClosure",
@@ -1725,16 +1725,16 @@
},
{
"name": "laravel/framework",
"version": "v5.1.24",
"version": "v5.1.26",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "875baf2d1645ce23e2ec0bf94fa7bb3e7fbfd6ed"
"reference": "be7fbb60376bd61f07e9c637473e5b2cf7eebe5c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/875baf2d1645ce23e2ec0bf94fa7bb3e7fbfd6ed",
"reference": "875baf2d1645ce23e2ec0bf94fa7bb3e7fbfd6ed",
"url": "https://api.github.com/repos/laravel/framework/zipball/be7fbb60376bd61f07e9c637473e5b2cf7eebe5c",
"reference": "be7fbb60376bd61f07e9c637473e5b2cf7eebe5c",
"shasum": ""
},
"require": {
@@ -1799,7 +1799,7 @@
"require-dev": {
"aws/aws-sdk-php": "~3.0",
"iron-io/iron_mq": "~2.0",
"mockery/mockery": "~0.9.1",
"mockery/mockery": "~0.9.2",
"pda/pheanstalk": "~3.0",
"phpunit/phpunit": "~4.0",
"predis/predis": "~1.0"
@@ -1808,7 +1808,7 @@
"aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).",
"doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).",
"fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
"guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers (~5.3|~6.0).",
"guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~5.3|~6.0).",
"iron-io/iron_mq": "Required to use the iron queue driver (~2.0).",
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
"league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
@@ -1850,7 +1850,7 @@
"framework",
"laravel"
],
"time": "2015-11-11 22:45:42"
"time": "2015-12-02 21:59:57"
},
{
"name": "league/commonmark",
@@ -2279,16 +2279,16 @@
},
{
"name": "paragonie/random_compat",
"version": "1.1.0",
"version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
"reference": "19f765b66c6fbb56ee3b11bc16d52e38eebdc295"
"reference": "a208865a5aeffc2dbbef2a5b3409887272d93f32"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/19f765b66c6fbb56ee3b11bc16d52e38eebdc295",
"reference": "19f765b66c6fbb56ee3b11bc16d52e38eebdc295",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/a208865a5aeffc2dbbef2a5b3409887272d93f32",
"reference": "a208865a5aeffc2dbbef2a5b3409887272d93f32",
"shasum": ""
},
"require": {
@@ -2323,7 +2323,7 @@
"pseudorandom",
"random"
],
"time": "2015-11-10 00:45:41"
"time": "2015-12-01 02:52:15"
},
{
"name": "pragmarx/google2fa",
@@ -2983,16 +2983,16 @@
},
{
"name": "symfony/event-dispatcher",
"version": "v2.7.7",
"version": "v2.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "7e2f9c31645680026c2372edf66f863fc7757af5"
"reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7e2f9c31645680026c2372edf66f863fc7757af5",
"reference": "7e2f9c31645680026c2372edf66f863fc7757af5",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5eb815363c0388e83247e7e9853e5dbc14999cc",
"reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc",
"shasum": ""
},
"require": {
@@ -3000,10 +3000,10 @@
},
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~2.0,>=2.0.5",
"symfony/dependency-injection": "~2.6",
"symfony/expression-language": "~2.6",
"symfony/stopwatch": "~2.3"
"symfony/config": "~2.0,>=2.0.5|~3.0.0",
"symfony/dependency-injection": "~2.6|~3.0.0",
"symfony/expression-language": "~2.6|~3.0.0",
"symfony/stopwatch": "~2.3|~3.0.0"
},
"suggest": {
"symfony/dependency-injection": "",
@@ -3012,7 +3012,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
"dev-master": "2.8-dev"
}
},
"autoload": {
@@ -3039,7 +3039,7 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2015-10-30 20:10:21"
"time": "2015-10-30 20:15:42"
},
{
"name": "symfony/finder",
@@ -4265,16 +4265,16 @@
},
{
"name": "phpunit/phpunit",
"version": "4.8.18",
"version": "4.8.19",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "fa33d4ad96481b91df343d83e8c8aabed6b1dfd3"
"reference": "b2caaf8947aba5e002d42126723e9d69795f32b4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fa33d4ad96481b91df343d83e8c8aabed6b1dfd3",
"reference": "fa33d4ad96481b91df343d83e8c8aabed6b1dfd3",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b2caaf8947aba5e002d42126723e9d69795f32b4",
"reference": "b2caaf8947aba5e002d42126723e9d69795f32b4",
"shasum": ""
},
"require": {
@@ -4333,7 +4333,7 @@
"testing",
"xunit"
],
"time": "2015-11-11 11:32:49"
"time": "2015-11-30 08:18:59"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -4509,16 +4509,16 @@
},
{
"name": "sebastian/environment",
"version": "1.3.2",
"version": "1.3.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
"reference": "6324c907ce7a52478eeeaede764f48733ef5ae44"
"reference": "6e7133793a8e5a5714a551a8324337374be209df"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44",
"reference": "6324c907ce7a52478eeeaede764f48733ef5ae44",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e7133793a8e5a5714a551a8324337374be209df",
"reference": "6e7133793a8e5a5714a551a8324337374be209df",
"shasum": ""
},
"require": {
@@ -4555,7 +4555,7 @@
"environment",
"hhvm"
],
"time": "2015-08-03 06:14:51"
"time": "2015-12-02 08:37:27"
},
{
"name": "sebastian/exporter",
@@ -4764,25 +4764,25 @@
},
{
"name": "symfony/yaml",
"version": "v2.7.7",
"version": "v3.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "4cfcd7a9fceba662b3c036b7d9a91f6197af046c"
"reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/4cfcd7a9fceba662b3c036b7d9a91f6197af046c",
"reference": "4cfcd7a9fceba662b3c036b7d9a91f6197af046c",
"url": "https://api.github.com/repos/symfony/yaml/zipball/177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002",
"reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
"php": ">=5.5.9"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
"dev-master": "3.0-dev"
}
},
"autoload": {
@@ -4809,7 +4809,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2015-11-18 13:41:01"
"time": "2015-11-30 12:36:17"
}
],
"aliases": [],

View File

@@ -1,8 +1,8 @@
{
"dependencies": {
"bower": "~1.6.4",
"bower": "~1.6.6",
"gulp": "~3.9.0",
"laravel-elixir": "~3.4.2"
"laravel-elixir": "~4.0.4"
},
"private": true
}

File diff suppressed because one or more lines are too long

19
public/build/dist/css/all-d755dde6a5.css vendored Executable file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

17
public/build/dist/js/all-68c89890bf.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
{
"dist/css/all.css": "dist/css/all-5f7f41a9ac.css",
"dist/js/all.js": "dist/js/all-08a6790e58.js"
"dist/css/all.css": "dist/css/all-d755dde6a5.css",
"dist/js/all.js": "dist/js/all-68c89890bf.js"
}

View File

@@ -135,6 +135,7 @@
<div class="col-sm-12">
<div class="checkbox">
<label>
<input type="hidden" name="dashboard_login_link" value="0">
<input type="checkbox" value="1" name="dashboard_login_link" {{ Setting::get('dashboard_login_link') ? 'checked' : null }}>
{{ trans('forms.settings.theme.dashboard-login') }}
</label>