Compare commits

..

32 Commits
v2.0.1 ... 2.0

Author SHA1 Message Date
Graham Campbell
c1ab3a175c Bumped version 2015-12-18 12:51:20 +00:00
Graham Campbell
666da0125e Released 2.0.4 2015-12-18 12:50:27 +00:00
Graham Campbell
7ff5da78b9 Updated laravel 2015-12-18 12:48:05 +00:00
Graham Campbell
4886bb9815 Merge pull request #1238 from cachethq/fix-notifing-subscribers
Fixes #1237
2015-12-18 12:39:33 +00:00
James Brooks
d2beb6263e Remove indentation 2015-12-18 09:07:40 +00:00
James Brooks
dabed137ab Fixes #1237 2015-12-17 14:41:22 +00:00
James Brooks
f75c9f5500 Fixes #1218 2015-12-16 18:15:25 +00:00
James Brooks
b9b282ba7b Fixes #1234 2015-12-16 18:02:04 +00:00
James Brooks
5f2e2d5925 Merge pull request #1233 from phecho/fix-page_title
Fixed issue #1195
2015-12-16 13:49:27 +00:00
phecho
89c708de07 Fixed issue #1195 2015-12-16 21:42:02 +08:00
Graham Campbell
7f02aa2bce Updated dependencies 2015-12-15 15:38:04 +00:00
Graham Campbell
7de9440731 Bumped some minimum versions 2015-12-15 15:12:57 +00:00
Graham Campbell
409d34f251 Updated dependencies 2015-12-11 11:37:12 +00:00
Graham Campbell
68b0d35d1a Locked down some dependency versions 2015-12-11 11:34:21 +00:00
Graham Campbell
8ca809d5a0 Updated dependencies 2015-12-09 14:04:26 +00:00
Graham Campbell
9cde8277ad Bumped min exceptions version 2015-12-09 14:02:57 +00:00
Graham Campbell
c48f54ec28 Removed unused code 2015-12-07 12:05:08 +00:00
James Brooks
cf19fecdbe Fixes #1202 2015-12-07 07:18:06 +00:00
Graham Campbell
cce211159b Updated dependencies 2015-12-06 10:38:15 +00:00
Graham Campbell
cf9627ce99 Updated version 2015-12-02 22:26:21 +00:00
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
James Brooks
fc015757a7 Fix version 2015-11-26 13:47:23 +00:00
21 changed files with 296 additions and 173 deletions

View File

@@ -1 +1 @@
2.0.1-dev
2.0.5-dev

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

@@ -39,7 +39,7 @@ class AppComposer
$view->withAppGraphs(Setting::get('display_graphs'));
$view->withAppLocale(Setting::get('app_locale'));
$view->withAppName(Setting::get('app_name'));
$view->withAppStylesheet(Setting::get('app_stylesheet'));
$view->withAppStylesheet(Setting::get('stylesheet'));
$view->withAppUrl(Config::get('app.url'));
$view->withShowSupport(Setting::get('show_support'));
}

View File

@@ -65,7 +65,7 @@ class SendIncidentEmailNotificationHandler
// Only send emails for public incidents.
if ($event->incident->visible === 1) {
foreach ($this->subscriber->all() as $subscriber) {
foreach ($this->subscriber->isVerified()->get() as $subscriber) {
$mail = [
'email' => $subscriber->email,
'subject' => 'New incident reported.',

View File

@@ -62,7 +62,7 @@ class SendMaintenanceEmailNotificationHandler
$data = AutoPresenter::decorate($event->incident);
foreach ($this->subscriber->all() as $subscriber) {
foreach ($this->subscriber->isVerified()->get() as $subscriber) {
$mail = [
'email' => $subscriber->email,
'subject' => 'Scheduled maintenance.',

View File

@@ -32,8 +32,6 @@ class SubscriberController extends Controller
*/
public function showSubscribers()
{
$subscribers = Subscriber::all();
return View::make('dashboard.subscribers.index')
->withPageTitle(trans('dashboard.subscribers.subscribers').' - '.trans('dashboard.dashboard'))
->withSubscribers(Subscriber::all());

View File

@@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Models;
use AltThree\Validator\ValidatingTrait;
use CachetHQ\Cachet\Presenters\SubscriberPresenter;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use McCool\LaravelAutoPresenter\HasPresenter;
@@ -62,6 +63,18 @@ class Subscriber extends Model implements HasPresenter
});
}
/**
* Scope verified subscribers.
*
* @param \Illuminate\Database\Eloquent\Builder $query
*
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeIsVerified(Builder $query)
{
return $query->whereNotNull('verified_at');
}
/**
* Determines if the subscriber is verified.
*

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",
@@ -30,20 +30,20 @@
"graham-campbell/core": "^4.2",
"graham-campbell/markdown": "^5.3",
"graham-campbell/throttle": "^5.1",
"graham-campbell/exceptions": "^6.0",
"graham-campbell/exceptions": "^6.1",
"guzzlehttp/guzzle": "^6.1",
"jenssegers/date": "^3.0",
"jenssegers/date": "^3.1",
"mccool/laravel-auto-presenter": "^4.2",
"pragmarx/google2fa": "^0.7",
"rcrowe/twigbridge": "^0.9",
"roumen/feed": "^2.9"
"roumen/feed": "^2.9.8"
},
"require-dev": {
"filp/whoops": "^1.1",
"fzaninotto/faker": "^1.5",
"graham-campbell/testbench-core": "^1.1",
"mockery/mockery": "^0.9.4",
"phpunit/phpunit": "^4.8"
"mockery/mockery": "0.9.4",
"phpunit/phpunit": "4.8.19"
},
"autoload": {
"classmap": [

328
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": "69351d8294abb8da597970b4efe4832b",
"content-hash": "ab7a9bda7516015750a94f9792b45bb4",
"packages": [
{
"name": "alt-three/emoji",
@@ -530,16 +530,16 @@
},
{
"name": "doctrine/cache",
"version": "v1.5.1",
"version": "v1.5.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e"
"reference": "47c7128262da274f590ae6f86eb137a7a64e82af"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/2b9cec5a5e722010cbebc91713d4c11eaa064d5e",
"reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e",
"url": "https://api.github.com/repos/doctrine/cache/zipball/47c7128262da274f590ae6f86eb137a7a64e82af",
"reference": "47c7128262da274f590ae6f86eb137a7a64e82af",
"shasum": ""
},
"require": {
@@ -596,7 +596,7 @@
"cache",
"caching"
],
"time": "2015-11-02 18:35:48"
"time": "2015-12-03 10:50:37"
},
{
"name": "doctrine/collections",
@@ -666,16 +666,16 @@
},
{
"name": "doctrine/common",
"version": "v2.5.1",
"version": "v2.5.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/common.git",
"reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9"
"reference": "311001fd9865a4d0d59efff4eac6d7dcb3f5270c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/common/zipball/0009b8f0d4a917aabc971fb089eba80e872f83f9",
"reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9",
"url": "https://api.github.com/repos/doctrine/common/zipball/311001fd9865a4d0d59efff4eac6d7dcb3f5270c",
"reference": "311001fd9865a4d0d59efff4eac6d7dcb3f5270c",
"shasum": ""
},
"require": {
@@ -692,7 +692,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6.x-dev"
"dev-master": "2.5.x-dev"
}
},
"autoload": {
@@ -735,7 +735,7 @@
"persistence",
"spl"
],
"time": "2015-08-31 13:00:22"
"time": "2015-12-04 12:49:42"
},
{
"name": "doctrine/dbal",
@@ -1105,16 +1105,16 @@
},
{
"name": "graham-campbell/exceptions",
"version": "v6.0.0",
"version": "v6.1.0",
"source": {
"type": "git",
"url": "https://github.com/GrahamCampbell/Laravel-Exceptions.git",
"reference": "abd3ea87415e2420576ace02969798222a114752"
"reference": "febf4f8c2e8013742269625d1af6cb440c895b18"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/abd3ea87415e2420576ace02969798222a114752",
"reference": "abd3ea87415e2420576ace02969798222a114752",
"url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/febf4f8c2e8013742269625d1af6cb440c895b18",
"reference": "febf4f8c2e8013742269625d1af6cb440c895b18",
"shasum": ""
},
"require": {
@@ -1138,7 +1138,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.1-dev"
}
},
"autoload": {
@@ -1170,7 +1170,7 @@
"laravel",
"whoops"
],
"time": "2015-11-22 19:54:20"
"time": "2015-12-09 12:50:33"
},
{
"name": "graham-campbell/markdown",
@@ -1611,26 +1611,26 @@
},
{
"name": "jenssegers/date",
"version": "v3.0.10",
"version": "v3.1.0",
"source": {
"type": "git",
"url": "https://github.com/jenssegers/date.git",
"reference": "467278308153eb27048e471213366193587d87a0"
"reference": "0fac566c8bc34a095b5bf418db888fdf11632a96"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jenssegers/date/zipball/467278308153eb27048e471213366193587d87a0",
"reference": "467278308153eb27048e471213366193587d87a0",
"url": "https://api.github.com/repos/jenssegers/date/zipball/0fac566c8bc34a095b5bf418db888fdf11632a96",
"reference": "0fac566c8bc34a095b5bf418db888fdf11632a96",
"shasum": ""
},
"require": {
"nesbot/carbon": "~1.0",
"nesbot/carbon": "^1.0",
"php": ">=5.3.3",
"symfony/translation": "~2.0"
"symfony/translation": "^2.0|^3.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0",
"satooshi/php-coveralls": "~0.6"
"phpunit/phpunit": "^4.0|^5.0",
"satooshi/php-coveralls": "^0.6"
},
"type": "library",
"extra": {
@@ -1650,10 +1650,11 @@
"authors": [
{
"name": "Jens Segers",
"homepage": "http://jenssegers.be"
"homepage": "https://jenssegers.com"
}
],
"description": "A date library to help you work with dates in different languages",
"homepage": "https://github.com/jenssegers/date",
"keywords": [
"carbon",
"date",
@@ -1663,34 +1664,34 @@
"time",
"translation"
],
"time": "2015-09-24 17:36:06"
"time": "2015-12-11 22:19:37"
},
{
"name": "jeremeamia/SuperClosure",
"version": "2.1.0",
"version": "2.2.0",
"source": {
"type": "git",
"url": "https://github.com/jeremeamia/super_closure.git",
"reference": "b712f39c671e5ead60c7ebfe662545456aade833"
"reference": "29a88be2a4846d27c1613aed0c9071dfad7b5938"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/b712f39c671e5ead60c7ebfe662545456aade833",
"reference": "b712f39c671e5ead60c7ebfe662545456aade833",
"url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/29a88be2a4846d27c1613aed0c9071dfad7b5938",
"reference": "29a88be2a4846d27c1613aed0c9071dfad7b5938",
"shasum": ""
},
"require": {
"nikic/php-parser": "~1.0",
"php": ">=5.4"
"nikic/php-parser": "^1.2|^2.0",
"php": ">=5.4",
"symfony/polyfill-php56": "^1.0"
},
"require-dev": {
"codeclimate/php-test-reporter": "~0.1.2",
"phpunit/phpunit": "~4.0"
"phpunit/phpunit": "^4.0|^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
"dev-master": "2.2-dev"
}
},
"autoload": {
@@ -1721,20 +1722,20 @@
"serialize",
"tokenizer"
],
"time": "2015-03-11 20:06:43"
"time": "2015-12-05 17:17:57"
},
{
"name": "laravel/framework",
"version": "v5.1.24",
"version": "v5.1.27",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "875baf2d1645ce23e2ec0bf94fa7bb3e7fbfd6ed"
"reference": "b16f80878fd3603022d3c84593397cedd9af0bcf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/875baf2d1645ce23e2ec0bf94fa7bb3e7fbfd6ed",
"reference": "875baf2d1645ce23e2ec0bf94fa7bb3e7fbfd6ed",
"url": "https://api.github.com/repos/laravel/framework/zipball/b16f80878fd3603022d3c84593397cedd9af0bcf",
"reference": "b16f80878fd3603022d3c84593397cedd9af0bcf",
"shasum": ""
},
"require": {
@@ -1780,7 +1781,6 @@
"illuminate/events": "self.version",
"illuminate/exception": "self.version",
"illuminate/filesystem": "self.version",
"illuminate/foundation": "self.version",
"illuminate/hashing": "self.version",
"illuminate/http": "self.version",
"illuminate/log": "self.version",
@@ -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-17 20:35:38"
},
{
"name": "league/commonmark",
@@ -2234,32 +2234,38 @@
},
{
"name": "nikic/php-parser",
"version": "v1.4.1",
"version": "v2.0.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51"
"reference": "c542e5d86a9775abd1021618eb2430278bfc1e01"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51",
"reference": "f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c542e5d86a9775abd1021618eb2430278bfc1e01",
"reference": "c542e5d86a9775abd1021618eb2430278bfc1e01",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
"php": ">=5.3"
"php": ">=5.4"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
},
"bin": [
"bin/php-parse"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
"dev-master": "2.0-dev"
}
},
"autoload": {
"files": [
"lib/bootstrap.php"
]
"psr-4": {
"PhpParser\\": "lib/PhpParser"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -2275,20 +2281,20 @@
"parser",
"php"
],
"time": "2015-09-19 14:15:08"
"time": "2015-12-04 15:28:43"
},
{
"name": "paragonie/random_compat",
"version": "1.1.0",
"version": "1.1.4",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
"reference": "19f765b66c6fbb56ee3b11bc16d52e38eebdc295"
"reference": "d762ee5b099a29044603cd4649851e81aa66cb47"
},
"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/d762ee5b099a29044603cd4649851e81aa66cb47",
"reference": "d762ee5b099a29044603cd4649851e81aa66cb47",
"shasum": ""
},
"require": {
@@ -2323,7 +2329,7 @@
"pseudorandom",
"random"
],
"time": "2015-11-10 00:45:41"
"time": "2015-12-10 14:48:13"
},
{
"name": "pragmarx/google2fa",
@@ -2604,16 +2610,16 @@
},
{
"name": "roumen/feed",
"version": "v2.9.7",
"version": "v2.9.8",
"source": {
"type": "git",
"url": "https://github.com/RoumenDamianoff/laravel-feed.git",
"reference": "4611e281e28934b17c564be8f709ac99176cf5f9"
"reference": "dce91e2d7a912b7b4d6448cc3e7faef725b4c752"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/RoumenDamianoff/laravel-feed/zipball/4611e281e28934b17c564be8f709ac99176cf5f9",
"reference": "4611e281e28934b17c564be8f709ac99176cf5f9",
"url": "https://api.github.com/repos/RoumenDamianoff/laravel-feed/zipball/dce91e2d7a912b7b4d6448cc3e7faef725b4c752",
"reference": "dce91e2d7a912b7b4d6448cc3e7faef725b4c752",
"shasum": ""
},
"require": {
@@ -2651,7 +2657,7 @@
"laravel",
"rss"
],
"time": "2015-11-02 19:03:05"
"time": "2015-12-11 18:20:14"
},
{
"name": "simplesoftwareio/simple-qrcode",
@@ -2983,16 +2989,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 +3006,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 +3018,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
"dev-master": "2.8-dev"
}
},
"autoload": {
@@ -3039,7 +3045,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",
@@ -3227,6 +3233,114 @@
"homepage": "https://symfony.com",
"time": "2015-11-23 11:57:49"
},
{
"name": "symfony/polyfill-php56",
"version": "v1.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
"reference": "a6bd4770a6967517e6610529e14afaa3111094a3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/a6bd4770a6967517e6610529e14afaa3111094a3",
"reference": "a6bd4770a6967517e6610529e14afaa3111094a3",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"symfony/polyfill-util": "~1.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Php56\\": ""
},
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"time": "2015-11-04 20:28:58"
},
{
"name": "symfony/polyfill-util",
"version": "v1.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-util.git",
"reference": "4271c55cbc0a77b2641f861b978123e46b3da969"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4271c55cbc0a77b2641f861b978123e46b3da969",
"reference": "4271c55cbc0a77b2641f861b978123e46b3da969",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Util\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony utilities for portability of PHP codes",
"homepage": "https://symfony.com",
"keywords": [
"compat",
"compatibility",
"polyfill",
"shim"
],
"time": "2015-11-04 20:28:58"
},
{
"name": "symfony/process",
"version": "v2.7.7",
@@ -4265,16 +4379,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 +4447,7 @@
"testing",
"xunit"
],
"time": "2015-11-11 11:32:49"
"time": "2015-11-30 08:18:59"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -4457,28 +4571,28 @@
},
{
"name": "sebastian/diff",
"version": "1.3.0",
"version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
"reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
"reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
"reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
"reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"phpunit/phpunit": "~4.2"
"phpunit/phpunit": "~4.8"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.3-dev"
"dev-master": "1.4-dev"
}
},
"autoload": {
@@ -4501,24 +4615,24 @@
}
],
"description": "Diff implementation",
"homepage": "http://www.github.com/sebastianbergmann/diff",
"homepage": "https://github.com/sebastianbergmann/diff",
"keywords": [
"diff"
],
"time": "2015-02-22 15:13:53"
"time": "2015-12-08 07:14:41"
},
{
"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 +4669,7 @@
"environment",
"hhvm"
],
"time": "2015-08-03 06:14:51"
"time": "2015-12-02 08:37:27"
},
{
"name": "sebastian/exporter",
@@ -4676,16 +4790,16 @@
},
{
"name": "sebastian/recursion-context",
"version": "1.0.1",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
"reference": "994d4a811bafe801fb06dccbee797863ba2792ba"
"reference": "913401df809e99e4f47b27cdd781f4a258d58791"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba",
"reference": "994d4a811bafe801fb06dccbee797863ba2792ba",
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
"reference": "913401df809e99e4f47b27cdd781f4a258d58791",
"shasum": ""
},
"require": {
@@ -4725,7 +4839,7 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
"time": "2015-06-21 08:04:50"
"time": "2015-11-11 19:50:13"
},
{
"name": "sebastian/version",
@@ -4764,25 +4878,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 +4923,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

@@ -1,15 +1,15 @@
@if ($errors->any())
@include('dashboard.partials._error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')])
@include('dashboard.partials._error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')])
@endif
@if ($message = Session::get('success'))
@include('dashboard.partials._error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message])
@include('dashboard.partials._error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message])
@endif
@if ($message = Session::get('warning'))
@include('dashboard.partials._error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message])
@include('dashboard.partials._error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message])
@endif
@if ($message = Session::get('info'))
@include('dashboard.partials._error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message])
@include('dashboard.partials._error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message])
@endif

View File

@@ -18,7 +18,7 @@
<link rel="apple-touch-icon" sizes="144x144" href="/img/apple-touch-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="/img/apple-touch-icon-152x152.png">
<title>@yield('pageTitle', $app_name.' | Cachet')</title>
<title>{{ $page_title or $app_name.' | Cachet' }}</title>
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">

View File

@@ -21,7 +21,7 @@
<div class="col-xs-12">
<div class="form-group">
<label>{{ trans('forms.settings.stylesheet.custom-css') }}</label>
<textarea class="form-control autosize" name="stylesheet" rows="10">{{ $app_stylesheet }}</textarea>
<textarea class="form-control autosize" name="stylesheet" rows="10">{{ Setting::get('stylesheet') }}</textarea>
</div>
</div>
</div>

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>

View File

@@ -44,9 +44,9 @@
@include('partials.crowdin')
@if($stylesheet = $app_stylesheet)
@if($app_stylesheet)
<style type="text/css">
{!! $stylesheet !!}
{!! $app_stylesheet !!}
</style>
@endif

View File

@@ -93,7 +93,7 @@
chartConfig.datasets[0].data = _.values(charter);
charts[metricId].chart = new Chart(charts[metricId].context).Line(chartConfig, {
tooltipTemplate: $el.data('metric-name') + ": <%= value %> " + $el.data('metric-suffix'),
tooltipTemplate: $el.data('metric-name') + ": <{{ '%' }}= value %> " + $el.data('metric-suffix'),
scaleShowVerticalLines: true,
scaleShowLabels: false,
responsive: true,