mirror of
https://github.com/cachethq/cachet.git
synced 2026-03-05 10:47:01 +00:00
Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
c1ab3a175c | ||
|
|
666da0125e | ||
|
|
7ff5da78b9 | ||
|
|
4886bb9815 | ||
|
|
d2beb6263e | ||
|
|
dabed137ab | ||
|
|
f75c9f5500 | ||
|
|
b9b282ba7b | ||
|
|
5f2e2d5925 | ||
|
|
89c708de07 | ||
|
|
7f02aa2bce | ||
|
|
7de9440731 | ||
|
|
409d34f251 | ||
|
|
68b0d35d1a | ||
|
|
8ca809d5a0 | ||
|
|
9cde8277ad | ||
|
|
c48f54ec28 | ||
|
|
cf19fecdbe | ||
|
|
cce211159b | ||
|
|
cf9627ce99 |
@@ -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'));
|
||||
}
|
||||
|
||||
@@ -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.',
|
||||
|
||||
@@ -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.',
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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.
|
||||
*
|
||||
|
||||
@@ -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": [
|
||||
|
||||
270
composer.lock
generated
270
composer.lock
generated
@@ -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": "68368056b2e111808dc9fde989b5324d",
|
||||
"content-hash": "976eda704e6a191e2bd557cb919f1ed6",
|
||||
"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.12",
|
||||
"version": "v3.1.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/jenssegers/date.git",
|
||||
"reference": "2e423f6327cbf72a41fd6bac094a788bc524a863"
|
||||
"reference": "0fac566c8bc34a095b5bf418db888fdf11632a96"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/jenssegers/date/zipball/2e423f6327cbf72a41fd6bac094a788bc524a863",
|
||||
"reference": "2e423f6327cbf72a41fd6bac094a788bc524a863",
|
||||
"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-10-26 15:04:00"
|
||||
"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.26",
|
||||
"version": "v5.1.27",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/framework.git",
|
||||
"reference": "be7fbb60376bd61f07e9c637473e5b2cf7eebe5c"
|
||||
"reference": "b16f80878fd3603022d3c84593397cedd9af0bcf"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/be7fbb60376bd61f07e9c637473e5b2cf7eebe5c",
|
||||
"reference": "be7fbb60376bd61f07e9c637473e5b2cf7eebe5c",
|
||||
"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",
|
||||
@@ -1850,7 +1850,7 @@
|
||||
"framework",
|
||||
"laravel"
|
||||
],
|
||||
"time": "2015-12-02 21:59:57"
|
||||
"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.1",
|
||||
"version": "1.1.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/paragonie/random_compat.git",
|
||||
"reference": "a208865a5aeffc2dbbef2a5b3409887272d93f32"
|
||||
"reference": "d762ee5b099a29044603cd4649851e81aa66cb47"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/a208865a5aeffc2dbbef2a5b3409887272d93f32",
|
||||
"reference": "a208865a5aeffc2dbbef2a5b3409887272d93f32",
|
||||
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/d762ee5b099a29044603cd4649851e81aa66cb47",
|
||||
"reference": "d762ee5b099a29044603cd4649851e81aa66cb47",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2323,7 +2329,7 @@
|
||||
"pseudorandom",
|
||||
"random"
|
||||
],
|
||||
"time": "2015-12-01 02:52:15"
|
||||
"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",
|
||||
@@ -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",
|
||||
@@ -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,11 +4615,11 @@
|
||||
}
|
||||
],
|
||||
"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",
|
||||
@@ -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",
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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') }}">
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -44,9 +44,9 @@
|
||||
|
||||
@include('partials.crowdin')
|
||||
|
||||
@if($stylesheet = $app_stylesheet)
|
||||
@if($app_stylesheet)
|
||||
<style type="text/css">
|
||||
{!! $stylesheet !!}
|
||||
{!! $app_stylesheet !!}
|
||||
</style>
|
||||
@endif
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user