Updated dependencies

Fixes #934 - Scheduled items now drop into the right days

.dockerignore

@@ -1 +0,0 @@
-.git

.gitignore

@@ -2,4 +2,3 @@
 node_modules
 phpunit.xml
 vendor
-.vagrant

CONTRIBUTING.md

@@ -2,16 +2,15 @@
 
 ## Creating issues
 
-Issues should be made by using the [issue tracker](https://github.com/cachethq/Cachet/issues).
+Feature requests and bug reports should be made by using the [issue tracker](https://github.com/cachethq/Cachet/issues). Support questions should be directed to our support email; [support@alt-three.com](mailto:support@alt-three.com?subject=Cachet Support).
 
-Things to remember:
-
-- Be descriptive
-- Be respectful of others
+**Always be respectful.** Organization members reserve the right to lock topics if they feel necessary.
 
 ## Languages
 
-When needing to add labels, placeholders or general text, you **must not** write directly into the source file, rather make use of the `./app/lang/` directory. Always provide the English translation and copy your English string to all other languages - making sure that the indentation and alignment of the arrays are updated.
+When needing to add labels, placeholders or general text, you **must not** write directly into the source file, rather make use of the `./resources/lang/` directory.
+
+Always provide the English translation and copy your English string to all other languages - making sure that the indentation and alignment of the arrays are updated.
 
 ## Coding Standards
 
@@ -20,9 +19,9 @@ Please follow existing coding standards:
 ```php
 <?php
 
-namespace Foo\Bar\Controller;
+namespace CachetHQ\Cachet\Controller;
 
-use Foo\Bar\Bar;
+use CachetHQ\Cachet\Bar;
 
 class Foo extends Bar
 {
@@ -50,14 +49,13 @@ class Foo extends Bar
     }
     ```
 - Braces on a new line following: `namespace`, `use`, `function` and `class`.
-- Line lengths have a soft 80 limit and hard 120 length.
 - PHP constants should be in lowercase; `true`, `false` and `null`.
 - Defined constants should always be in uppercase.
 - Never leave trailing spaces at the end of a line.
 - Files should end with one blank line.
 - Do not use `# Bash` style comments.
 - Always add or update Docblocs to functions.
-- If your pull request consists of more than two commits, you **must** squash them into one.
+- We use [StyleCI](https://styleci.io) to automatically check code standards in Pull Requests. If your PR fails the CI check, then apply the supplied patch and re-push.
 
 If you're still unsure, then take a look at existing code.
 
@@ -75,8 +73,6 @@ If you're not particularly fond of the command line, you can get one of GitHub's
 
 If you're feeling adventurous, you can become a Git & GitHub master with the [Git Path on Code School](https://www.codeschool.com/paths/git).
 
-There is always the Cachet Gitter chat to ask any questions you may have:
-
-[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/cachethq/Cachet?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+## .editorconfig
 
 You should also make use of the [.editorconfig](/.editorconfig) file found within the root of the repository. It'll make sure that your editor is setup with the same file settings.

Dockerfile

@@ -1,37 +0,0 @@
-FROM debian:jessie
-
-# Using nodesource and debian jessie packages instead of compiling from scratch
-RUN DEBIAN_FRONTEND=noninteractive \
-    echo "APT::Install-Recommends \"0\";" >> /etc/apt/apt.conf.d/02recommends && \
-    echo "APT::Install-Suggests \"0\";" >> /etc/apt/apt.conf.d/02recommends && \
-    apt-get -qq update && \
-    apt-get -qq install \
-    ca-certificates nginx php5-fpm=5.* php5-curl php5-readline php5-mcrypt php5-mysql php5-apcu php5-cli \
-    git sqlite libsqlite3-dev curl supervisor cron php5-pgsql && \
-    apt-get clean && apt-get autoremove -qq && \
-    rm -rf /var/lib/apt/lists/* /usr/share/doc /usr/share/man /tmp/*
-
-COPY docker/supervisord.conf /etc/supervisor/supervisord.conf
-COPY docker/entrypoint.sh /sbin/entrypoint.sh
-COPY . /var/www/html/
-WORKDIR /var/www/html/
-
-# copy the various nginx and supervisor conf (to handle both fpm and nginx)
-RUN sed -i -e "s/;daemonize\s*=\s*yes/daemonize = no/g" /etc/php5/fpm/php-fpm.conf ;\
-    echo "daemon off;" >> /etc/nginx/nginx.conf ;\
-    mv /var/www/html/docker/php-fpm-pool.conf /etc/php5/fpm/pool.d/www.conf ;\
-    rm -f /etc/nginx/sites-enabled/* ;\
-    rm -f /etc/nginx/conf.d/* ;\
-    mv /var/www/html/docker/nginx-site.conf /etc/nginx/conf.d/default.conf ;\
-    mv /var/www/html/docker/.env.docker /var/www/html/.env ;\
-    rm -r /var/www/html/docker ;\
-    chown -R www-data /var/www/html ;\
-    curl -sS https://getcomposer.org/installer | php && php composer.phar install --no-dev -o
-
-EXPOSE 8000
-
-COPY docker/crontab /etc/cron.d/artisan-schedule
-RUN chmod 0644 /etc/cron.d/artisan-schedule
-RUN touch /var/log/cron.log
-
-CMD ["/sbin/entrypoint.sh"]

Homestead.yaml

@@ -1,40 +0,0 @@
----
-ip: "192.168.10.10"
-memory: 2048
-cpus: 1
-hostname: cachet
-name: cachet
-provider: virtualbox
-
-authorize: ~/.ssh/id_rsa.pub
-
-keys:
-    - ~/.ssh/id_rsa
-
-folders:
-    - map: "/srv/www/Cachet"
-      to: "/home/vagrant/Cachet"
-
-sites:
-    - map: homestead.app
-      to: "/home/vagrant/Cachet/public"
-
-databases:
-    - cachet
-
-variables:
-    - key: APP_ENV
-      value: local
-
-# blackfire:
-#     - id: foo
-#       token: bar
-#       client-id: foo
-#       client-token: bar
-
-# ports:
-#     - send: 93000
-#       to: 9300
-#     - send: 7777
-#       to: 777
-#       protocol: udp

README.md

@@ -28,7 +28,7 @@
 
 ### Development Requirements
 
-The following extra dependencies are required to develop Cachet:
+Theses extra dependencies are required to develop Cachet:
 
 - Node.js
 - Bower
@@ -38,6 +38,10 @@ The following extra dependencies are required to develop Cachet:
 
 You can now find our documentation at [https://docs.cachethq.io](https://docs.cachethq.io).
 
+- [Installing Cachet](https://docs.cachethq.io/docs/installing-cachet)
+- [Getting started with Docker](https://docs.cachethq.io/docs/get-started-with-docker)
+- [Getting started with Vagrant](https://docs.cachethq.io/docs/get-started-with-vagrant)
+
 ### Demo Account
 
 To test out the demo, you may login to the [Dashboard](https://demo.cachethq.io/dashboard) with the following:
@@ -47,103 +51,6 @@ To test out the demo, you may login to the [Dashboard](https://demo.cachethq.io/
 
 The demo is reset every half hour.
 
-## What Cachet is not
-
-Here is a list of things that Cachet is not or does not do:
-
-1. It does not monitor your services. It works only as a way to display the status of your services. *However, Cachet is able to receive updates from third-party services via its API.*
-2. It does not work on a plugin system. There are no monitoring services to extend.
-3. It's not a Twitter clone.
-
-## Quickstart with Vagrant
-
-If you would like to utilize [laravel homestead](http://laravel.com/docs/5.1/homestead), we have a per-project installation available to use for development purposes.
-
-First, install dependencies by `composer install` and modify Homestead.yaml to map your Cachet directory to the Vagrant VM properly. It looks like this by default:
-
-```yaml
-folders:
-    - map: "/srv/www/Cachet"
-      to: "/home/vagrant/Cachet"
-```
-
-Change the map key to the location of your Cachet installation and follow the instructions below.
-
-```bash
-# Copy over your environment variables
-$ cp .env.example .env
-
-# Initiate VM
-$ vagrant up
-
-# Generate application key
-$ php artisan key:generate
-
-# SSH into your machine
-$ vagrant ssh
-
-# Run migrations
-$ cd Cachet && php artisan migrate
-```
-
-Navigate to http://192.168.10.10 and begin using Cachet!
-
-## Quickstart with Docker
-
-Run a DB container (you can either pass in environment variables for the DB, or mount a config with `-v /my/database.php:/var/www/html/app/config/database.php`):
-
-```bash
-$ export DB_USERNAME=cachet
-$ export DB_PASSWORD=cachet
-$ export DB_ROOT_PASSWORD=cachet
-$ export DB_DATABASE=cachet
-$ docker run --name mysql -e MYSQL_USER=$DB_USERNAME -e MYSQL_PASSWORD=$DB_PASSWORD  -e MYSQL_ROOT_PASSWORD=$DB_ROOT_PASSWORD -e MYSQL_DATABASE=$DB_DATABASE -d mysql
-```
-
-Initialize the DB if you haven't yet:
-
-```bash
-$ docker run --rm --link mysql:mysql -e DB_HOST=mysql -e DB_DATABASE=$DB_DATABASE -e DB_USERNAME=$DB_USERNAME -e DB_PASSWORD=$DB_PASSWORD cachethq/cachet:latest php artisan migrate --force
-```
-
-Run Cachet:
-
-```bash
-$ docker run -d --name cachet --link mysql:mysql -p 80:8000 -e DB_HOST=mysql -e DB_DATABASE=$DB_DATABASE -e DB_USERNAME=$DB_USERNAME -e DB_PASSWORD=$DB_PASSWORD cachethq/cachet:latest
-```
-
-Now go to `http://<ipdockerisboundto>/setup` and have fun!
-
-Note: When running in production you should ensure that you enable SSL.
-This is commonly achieved by running Nginx with your certificates on your Docker host, service or load balancers in-front of the running container, or by adding your custom SSL certificates and configuration to the supplied Nginx configuration.
-
-### docker-compose
-
-Quickly launch Cachet and MySQL docker images with [docker-compose](https://docs.docker.com/compose/)
-
-```bash
-git clone https://github.com/cachethq/Cachet.git
-cd Cachet
-docker-compose build
-docker-compose up
-```
-
-To initialize the database, utilize [docker exec](https://docs.docker.com/reference/commandline/cli/#exec):
-```bash
-docker exec -it cachet_cachet_1 php artisan migrate --force
-```
-
-Continue to `http://<ipdockerisboundto>/setup` to configure Cachet.
-
-## Addons
-
-- [cachet-monitor](https://github.com/castawaylabs/cachet-monitor) - For URL monitoring. Automatic incident updates.
-- [sensu-cachet](https://github.com/bimlendu/sensu-cachethq) - Sensu handler for updating CachetHQ.
-
-## Read more about Cachet
-
-For more information on why I started developing Cachet, check out my [Cachet articles on my blog](https://james-brooks.uk/tag/cachet/?utm_source=github&utm_medium=readme&utm_campaign=github-cachet).
-
 ## Translations
 
 A special thank you to our [translators](https://crowdin.com/project/cachet/activity_stream), who have allowed us to share Cachet with the world. If you'd like to contribute translations, please check out our [CrowdIn project](https://crowdin.com/project/cachet).

Vagrantfile

@@ -1,23 +0,0 @@
-require 'json'
-require 'yaml'
-
-VAGRANTFILE_API_VERSION = "2"
-confDir = $confDir ||= File.expand_path("vendor/laravel/homestead")
-
-homesteadYamlPath = "Homestead.yaml"
-afterScriptPath = "after.sh"
-aliasesPath = "aliases"
-
-require File.expand_path(confDir + '/scripts/homestead.rb')
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-	if File.exists? aliasesPath then
-		config.vm.provision "file", source: aliasesPath, destination: "~/.bash_aliases"
-	end
-
-	Homestead.configure(config, YAML::load(File.read(homesteadYamlPath)))
-
-	if File.exists? afterScriptPath then
-		config.vm.provision "shell", path: afterScriptPath
-	end
-end

app/Http/Controllers/Admin/IncidentController.php

@@ -215,7 +215,7 @@ class IncidentController extends AbstractController
             return Redirect::back()->withInput(Binput::all())
                 ->with('title', sprintf(
                     '%s %s',
-                    trans('dashboard.notifications.awesome'),
+                    trans('dashboard.notifications.whoops'),
                     trans('dashboard.incidents.templates.add.failure')
                 ))
                 ->with('errors', $template->getErrors());
@@ -289,7 +289,7 @@ class IncidentController extends AbstractController
             return Redirect::back()->withInput(Binput::all())
                 ->with('title', sprintf(
                     '%s %s',
-                    trans('dashboard.notifications.awesome'),
+                    trans('dashboard.notifications.whoops'),
                     trans('dashboard.incidents.templates.edit.failure')
                 ))
                 ->with('errors', $incident->getErrors());

app/Http/Controllers/Admin/MetricController.php

@@ -116,7 +116,7 @@ class MetricController extends AbstractController
             return Redirect::back()->withInput(Binput::all())
                 ->with('title', sprintf(
                     '%s %s',
-                    trans('dashboard.notifications.awesome'),
+                    trans('dashboard.notifications.whoops'),
                     trans('dashboard.metrics.points.add.failure')
                 ))
                 ->with('errors', $point->getErrors());
@@ -176,7 +176,7 @@ class MetricController extends AbstractController
             return Redirect::back()->withInput(Binput::all())
                 ->with('title', sprintf(
                     '<strong>%s</strong>',
-                    trans('dashboard.notifications.awesome')
+                    trans('dashboard.notifications.whoops')
                 ))
                 ->with('errors', $metric->getErrors());
         }

app/Http/Controllers/Api/AbstractApiController.php

@@ -159,7 +159,15 @@ abstract class AbstractApiController extends BaseController
             ],
         ];
 
-        return $this->setMetaData($pagination)->setData(AutoPresenter::decorate($paginator->getCollection()))->respond();
+        $items = $paginator->getCollection();
+
+        if ($sortBy = $request->get('sort')) {
+            $direction = $request->has('order') && $request->get('order') == 'desc';
+
+            $items = $items->sortBy($sortBy, SORT_REGULAR, $direction);
+        }
+
+        return $this->setMetaData($pagination)->setData(AutoPresenter::decorate($items->values()->all()))->respond();
     }
 
     /**

app/Http/Controllers/HomeController.php

@@ -65,7 +65,13 @@ class HomeController extends AbstractController
         $allIncidents = Incident::notScheduled()->where('visible', '>=', $incidentVisiblity)->whereBetween('created_at', [
             $startDate->copy()->subDays($daysToShow)->format('Y-m-d').' 00:00:00',
             $startDate->format('Y-m-d').' 23:59:59',
-        ])->orderBy('created_at', 'desc')->get()->groupBy(function (Incident $incident) use ($dateTimeZone) {
+        ])->orderBy('scheduled_at', 'desc')->orderBy('created_at', 'desc')->get()->groupBy(function (Incident $incident) use ($dateTimeZone) {
+            // If it's scheduled, get the scheduled at date.
+            if ($incident->is_scheduled) {
+                return (new Date($incident->scheduled_at))
+                    ->setTimezone($dateTimeZone)->toDateString();
+            }
+
             return (new Date($incident->created_at))
                 ->setTimezone($dateTimeZone)->toDateString();
         });

app/Http/Routes/AuthRoutes.php

@@ -33,7 +33,7 @@ class AuthRoutes
 
                 $router->post('login', [
                     'middleware' => ['guest', 'csrf', 'throttling:10,10'],
-                    'as'         => 'logout',
+                    'as'         => 'login',
                     'uses'       => 'AuthController@postLogin',
                 ]);
 

app/Models/Incident.php

@@ -141,7 +141,7 @@ class Incident extends Model implements HasPresenter
      */
     public function getIsScheduledAttribute()
     {
-        return $this->getOriginal('scheduled_at');
+        return $this->getOriginal('scheduled_at') !== null;
     }
 
     /**

app/Presenters/IncidentPresenter.php

@@ -129,6 +129,34 @@ class IncidentPresenter extends AbstractPresenter
         return $this->wrappedObject->scheduled_at->setTimezone($this->setting->get('app_timezone'))->format('d/m/Y H:i');
     }
 
+    /**
+     * Returns a formatted timestamp for use within the timeline.
+     *
+     * @return string
+     */
+    public function timestamp_formatted()
+    {
+        if ($this->wrappedObject->is_scheduled) {
+            return $this->scheduled_at_formatted;
+        } else {
+            return $this->created_at_formatted;
+        }
+    }
+
+    /**
+     * Return the iso timestamp for use within the timeline.
+     *
+     * @return string
+     */
+    public function timestamp_iso()
+    {
+        if ($this->wrappedObject->is_scheduled) {
+            return $this->scheduled_at_iso;
+        } else {
+            return $this->created_at_iso;
+        }
+    }
+
     /**
      * Present the status with an icon.
      *

composer.json

@@ -20,8 +20,8 @@
     ],
     "require": {
         "php": "^5.5.9",
-        "laravel/framework": "~5.1.6",
-        "alt-three/emoji": "^1.0",
+        "laravel/framework": "~5.1.16",
+        "alt-three/emoji": "^1.2",
         "barryvdh/laravel-cors": "^0.5",
         "doctrine/dbal": "^2.5",
         "fideloper/proxy": "^3.0",
@@ -38,7 +38,6 @@
     },
     "require-dev": {
         "fzaninotto/faker": "^1.5",
-        "laravel/homestead": "^2.1.5",
         "mockery/mockery": "^0.9.4",
         "phpunit/phpunit": "^4.7.6"
     },
@@ -87,7 +86,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
     },
     "minimum-stability": "dev",

composer.lock

@@ -4,25 +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": "cb9ed2382887d7107bf177cef493b109",
+    "hash": "90090fbbbdb825dab65c6b5278b77aba",
     "packages": [
         {
             "name": "alt-three/emoji",
-            "version": "v1.0.0",
+            "version": "v1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AltThree/Emoji.git",
-                "reference": "2c46fde1d5993ea4a040259e5efc0682c33a5f90"
+                "reference": "92f01cb2bce289f199dee31e197660d6f6f572de"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AltThree/Emoji/zipball/2c46fde1d5993ea4a040259e5efc0682c33a5f90",
-                "reference": "2c46fde1d5993ea4a040259e5efc0682c33a5f90",
+                "url": "https://api.github.com/repos/AltThree/Emoji/zipball/92f01cb2bce289f199dee31e197660d6f6f572de",
+                "reference": "92f01cb2bce289f199dee31e197660d6f6f572de",
                 "shasum": ""
             },
             "require": {
                 "graham-campbell/markdown": "~4.0",
                 "guzzlehttp/guzzle": "~5.3|~6.0",
+                "illuminate/contracts": "5.1.*",
                 "illuminate/support": "5.1.*",
                 "php": ">=5.5.9"
             },
@@ -33,7 +34,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -65,7 +66,7 @@
                 "emoji",
                 "parser"
             ],
-            "time": "2015-07-25 14:20:46"
+            "time": "2015-08-14 22:18:26"
         },
         {
             "name": "asm89/stack-cors",
@@ -304,16 +305,16 @@
         },
         {
             "name": "doctrine/annotations",
-            "version": "v1.2.6",
+            "version": "v1.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4"
+                "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/f4a91702ca3cd2e568c3736aa031ed00c3752af4",
-                "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
+                "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
                 "shasum": ""
             },
             "require": {
@@ -368,20 +369,20 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2015-06-17 12:21:22"
+            "time": "2015-08-31 12:32:49"
         },
         {
             "name": "doctrine/cache",
-            "version": "v1.4.1",
+            "version": "v1.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03"
+                "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/c9eadeb743ac6199f7eec423cb9426bc518b7b03",
-                "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca",
+                "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca",
                 "shasum": ""
             },
             "require": {
@@ -438,7 +439,7 @@
                 "cache",
                 "caching"
             ],
-            "time": "2015-04-15 00:11:59"
+            "time": "2015-08-31 12:36:41"
         },
         {
             "name": "doctrine/collections",
@@ -508,16 +509,16 @@
         },
         {
             "name": "doctrine/common",
-            "version": "v2.5.0",
+            "version": "v2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/common.git",
-                "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3"
+                "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/common/zipball/cd8daf2501e10c63dced7b8b9b905844316ae9d3",
-                "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3",
+                "url": "https://api.github.com/repos/doctrine/common/zipball/0009b8f0d4a917aabc971fb089eba80e872f83f9",
+                "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9",
                 "shasum": ""
             },
             "require": {
@@ -577,7 +578,7 @@
                 "persistence",
                 "spl"
             ],
-            "time": "2015-04-02 19:55:44"
+            "time": "2015-08-31 13:00:22"
         },
         {
             "name": "doctrine/dbal",
@@ -1251,16 +1252,16 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "2ee5bc7f1a92efecc90da7f6711a53a7be26b5b7"
+                "reference": "97fe7210def29451ec74923b27e552238defd75a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/2ee5bc7f1a92efecc90da7f6711a53a7be26b5b7",
-                "reference": "2ee5bc7f1a92efecc90da7f6711a53a7be26b5b7",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/97fe7210def29451ec74923b27e552238defd75a",
+                "reference": "97fe7210def29451ec74923b27e552238defd75a",
                 "shasum": ""
             },
             "require": {
@@ -1280,7 +1281,7 @@
                     "GuzzleHttp\\Promise\\": "src/"
                 },
                 "files": [
-                    "src/functions.php"
+                    "src/functions_include.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1298,20 +1299,20 @@
             "keywords": [
                 "promise"
             ],
-            "time": "2015-06-24 16:16:25"
+            "time": "2015-08-15 19:37:21"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "af0e1758de355eb113917ad79c3c0e3604bce4bd"
+                "reference": "4ef919b0cf3b1989523138b60163bbcb7ba1ff7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/af0e1758de355eb113917ad79c3c0e3604bce4bd",
-                "reference": "af0e1758de355eb113917ad79c3c0e3604bce4bd",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/4ef919b0cf3b1989523138b60163bbcb7ba1ff7e",
+                "reference": "4ef919b0cf3b1989523138b60163bbcb7ba1ff7e",
                 "shasum": ""
             },
             "require": {
@@ -1335,7 +1336,7 @@
                     "GuzzleHttp\\Psr7\\": "src/"
                 },
                 "files": [
-                    "src/functions.php"
+                    "src/functions_include.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1356,7 +1357,7 @@
                 "stream",
                 "uri"
             ],
-            "time": "2015-06-24 19:55:15"
+            "time": "2015-08-15 19:32:36"
         },
         {
             "name": "jakub-onderka/php-console-color",
@@ -1447,16 +1448,16 @@
         },
         {
             "name": "jenssegers/date",
-            "version": "v3.0.7",
+            "version": "v3.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jenssegers/laravel-date.git",
-                "reference": "7933306f067f1ce230e31fee91783320627f7326"
+                "reference": "4a5ecdc2e622ccf426e058a28449f06cc5d9200b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jenssegers/laravel-date/zipball/7933306f067f1ce230e31fee91783320627f7326",
-                "reference": "7933306f067f1ce230e31fee91783320627f7326",
+                "url": "https://api.github.com/repos/jenssegers/laravel-date/zipball/4a5ecdc2e622ccf426e058a28449f06cc5d9200b",
+                "reference": "4a5ecdc2e622ccf426e058a28449f06cc5d9200b",
                 "shasum": ""
             },
             "require": {
@@ -1499,7 +1500,7 @@
                 "time",
                 "translation"
             ],
-            "time": "2015-07-25 18:06:01"
+            "time": "2015-08-10 11:19:08"
         },
         {
             "name": "jeremeamia/SuperClosure",
@@ -1543,7 +1544,7 @@
                     "name": "Jeremy Lindblom",
                     "email": "jeremeamia@gmail.com",
                     "homepage": "https://github.com/jeremeamia",
-                    "role": "developer"
+                    "role": "Developer"
                 }
             ],
             "description": "Serialize Closure objects, including their context and binding",
@@ -1561,16 +1562,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.1.8",
+            "version": "v5.1.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "c4ce8d7a3ac6e655e8b5f0ff3ee07d24fab765ba"
+                "reference": "e34dcc0c57e0f560248aec5128161256ff8bf4e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/c4ce8d7a3ac6e655e8b5f0ff3ee07d24fab765ba",
-                "reference": "c4ce8d7a3ac6e655e8b5f0ff3ee07d24fab765ba",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/e34dcc0c57e0f560248aec5128161256ff8bf4e1",
+                "reference": "e34dcc0c57e0f560248aec5128161256ff8bf4e1",
                 "shasum": ""
             },
             "require": {
@@ -1685,7 +1686,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2015-07-21 18:33:13"
+            "time": "2015-09-04 12:46:14"
         },
         {
             "name": "league/commonmark",
@@ -1892,16 +1893,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "1.15.0",
+            "version": "1.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0"
+                "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/dc5150cc608f2334c72c3b6a553ec9668a4156b0",
-                "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0524c87587ab85bc4c2d6f5b41253ccb930a5422",
+                "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422",
                 "shasum": ""
             },
             "require": {
@@ -1918,7 +1919,7 @@
                 "php-console/php-console": "^3.1.3",
                 "phpunit/phpunit": "~4.5",
                 "phpunit/phpunit-mock-objects": "2.3.0",
-                "raven/raven": "~0.8",
+                "raven/raven": "~0.11",
                 "ruflin/elastica": ">=0.90 <3.0",
                 "swiftmailer/swiftmailer": "~5.3",
                 "videlalvaro/php-amqplib": "~2.4"
@@ -1938,7 +1939,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15.x-dev"
+                    "dev-master": "1.16.x-dev"
                 }
             },
             "autoload": {
@@ -1964,7 +1965,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2015-07-12 13:54:09"
+            "time": "2015-08-31 09:17:37"
         },
         {
             "name": "mtdowling/cron-expression",
@@ -3374,47 +3375,6 @@
             ],
             "time": "2015-05-11 14:41:42"
         },
-        {
-            "name": "laravel/homestead",
-            "version": "v2.1.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laravel/homestead.git",
-                "reference": "ca55677158b1ae83106195537092095573b5822a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/homestead/zipball/ca55677158b1ae83106195537092095573b5822a",
-                "reference": "ca55677158b1ae83106195537092095573b5822a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4",
-                "symfony/console": "~2.0",
-                "symfony/process": "~2.0"
-            },
-            "bin": [
-                "homestead"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Laravel\\Homestead\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Taylor Otwell",
-                    "email": "taylorotwell@gmail.com"
-                }
-            ],
-            "description": "A virtual machine for web artisans.",
-            "time": "2015-07-23 14:53:43"
-        },
         {
             "name": "mockery/mockery",
             "version": "0.9.4",
@@ -3531,16 +3491,16 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.4.1",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373"
+                "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
-                "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7",
+                "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7",
                 "shasum": ""
             },
             "require": {
@@ -3587,20 +3547,20 @@
                 "spy",
                 "stub"
             ],
-            "time": "2015-04-27 22:15:08"
+            "time": "2015-08-13 10:07:40"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "2.2.1",
+            "version": "2.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "6526d9bdb56e2af1e8950114d42391044d18cfa7"
+                "reference": "2d7c03c0e4e080901b8f33b2897b0577be18a13c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6526d9bdb56e2af1e8950114d42391044d18cfa7",
-                "reference": "6526d9bdb56e2af1e8950114d42391044d18cfa7",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2d7c03c0e4e080901b8f33b2897b0577be18a13c",
+                "reference": "2d7c03c0e4e080901b8f33b2897b0577be18a13c",
                 "shasum": ""
             },
             "require": {
@@ -3608,7 +3568,7 @@
                 "phpunit/php-file-iterator": "~1.3",
                 "phpunit/php-text-template": "~1.2",
                 "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "~1.3.1",
+                "sebastian/environment": "^1.3.2",
                 "sebastian/version": "~1.0"
             },
             "require-dev": {
@@ -3649,7 +3609,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-08-02 04:45:08"
+            "time": "2015-08-04 03:42:39"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -3782,16 +3742,16 @@
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "1.4.3",
+            "version": "1.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9"
+                "reference": "3ab72c62e550370a6cd5dc873e1a04ab57562f5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/7a9b0969488c3c54fd62b4d504b3ec758fd005d9",
-                "reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3ab72c62e550370a6cd5dc873e1a04ab57562f5b",
+                "reference": "3ab72c62e550370a6cd5dc873e1a04ab57562f5b",
                 "shasum": ""
             },
             "require": {
@@ -3827,20 +3787,20 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2015-06-19 03:43:16"
+            "time": "2015-08-16 08:51:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.7.7",
+            "version": "4.8.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "9b97f9d807b862c2de2a36e86690000801c85724"
+                "reference": "2246830f4a1a551c67933e4171bf2126dc29d357"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9b97f9d807b862c2de2a36e86690000801c85724",
-                "reference": "9b97f9d807b862c2de2a36e86690000801c85724",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2246830f4a1a551c67933e4171bf2126dc29d357",
+                "reference": "2246830f4a1a551c67933e4171bf2126dc29d357",
                 "shasum": ""
             },
             "require": {
@@ -3850,7 +3810,7 @@
                 "ext-reflection": "*",
                 "ext-spl": "*",
                 "php": ">=5.3.3",
-                "phpspec/prophecy": "~1.3,>=1.3.1",
+                "phpspec/prophecy": "^1.3.1",
                 "phpunit/php-code-coverage": "~2.1",
                 "phpunit/php-file-iterator": "~1.4",
                 "phpunit/php-text-template": "~1.2",
@@ -3858,7 +3818,7 @@
                 "phpunit/phpunit-mock-objects": "~2.3",
                 "sebastian/comparator": "~1.1",
                 "sebastian/diff": "~1.2",
-                "sebastian/environment": "~1.2",
+                "sebastian/environment": "~1.3",
                 "sebastian/exporter": "~1.2",
                 "sebastian/global-state": "~1.0",
                 "sebastian/version": "~1.0",
@@ -3873,7 +3833,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.7.x-dev"
+                    "dev-master": "4.8.x-dev"
                 }
             },
             "autoload": {
@@ -3899,24 +3859,24 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-07-13 11:28:34"
+            "time": "2015-08-24 04:09:38"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.6",
+            "version": "2.3.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "18dfbcb81d05e2296c0bcddd4db96cade75e6f42"
+                "reference": "5e2645ad49d196e020b85598d7c97e482725786a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/18dfbcb81d05e2296c0bcddd4db96cade75e6f42",
-                "reference": "18dfbcb81d05e2296c0bcddd4db96cade75e6f42",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5e2645ad49d196e020b85598d7c97e482725786a",
+                "reference": "5e2645ad49d196e020b85598d7c97e482725786a",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "~1.0,>=1.0.2",
+                "doctrine/instantiator": "^1.0.2",
                 "php": ">=5.3.3",
                 "phpunit/php-text-template": "~1.2",
                 "sebastian/exporter": "~1.2"
@@ -3955,7 +3915,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2015-07-10 06:54:24"
+            "time": "2015-08-19 09:14:08"
         },
         {
             "name": "sebastian/comparator",

config/app.php

@@ -161,7 +161,6 @@ return [
         'McCool\LaravelAutoPresenter\LaravelAutoPresenterServiceProvider',
         'PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider',
         'Roumen\Feed\FeedServiceProvider',
-        'Barryvdh\Cors\CorsServiceProvider',
 
         /*
          * Application Service Providers...

config/emoji.php

@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | GitHub Token
+    |--------------------------------------------------------------------------
+    |
+    | Here you may get us to use your personal github access token to increase
+    | your rate limit while contacting GitHub's API.
+    |
+    */
+
+    'token' => env('GITHUB_TOKEN', null),
+
+];

database/seeds/IncidentTableSeeder.php

@@ -47,6 +47,7 @@ class IncidentTableSeeder extends Seeder
             [
                 'name'         => 'Test Incident',
                 'message'      => 'Something went wrong, oh noes.',
+                'status'       => 1,
                 'component_id' => 0,
                 'scheduled_at' => null,
                 'visible'      => 1,

docker-compose.yml

@@ -1,18 +0,0 @@
-mysql:
-  image: mysql:5.6
-  environment:
-    - MYSQL_ROOT_PASSWORD=cachet
-    - MYSQL_DATABASE=cachet
-    - MYSQL_USER=cachet
-    - MYSQL_PASSWORD=cachet
-cachet:
-  build: .
-  ports:
-    - 80:8000
-  links:
-    - mysql:mysql
-  environment:
-    - DB_HOST=mysql
-    - DB_DATABASE=cachet
-    - DB_USERNAME=cachet
-    - DB_PASSWORD=cachet

docker/.env.docker

@@ -1,27 +0,0 @@
-APP_ENV={{APP_ENV}}
-APP_DEBUG={{APP_DEBUG}}
-APP_URL={{APP_URL}}
-APP_KEY={{APP_KEY}}
-
-DB_DRIVER={{DB_DRIVER}}
-DB_HOST={{DB_HOST}}
-DB_DATABASE={{DB_DATABASE}}
-DB_USERNAME={{DB_USERNAME}}
-DB_PASSWORD={{DB_PASSWORD}}
-
-CACHE_DRIVER={{CACHE_DRIVER}}
-SESSION_DRIVER={{SESSION_DRIVER}}
-QUEUE_DRIVER={{QUEUE_DRIVER}}
-
-MAIL_DRIVER={{MAIL_DRIVER}}
-MAIL_HOST={{MAIL_HOST}}
-MAIL_PORT={{MAIL_PORT}}
-MAIL_USERNAME={{MAIL_USERNAME}}
-MAIL_PASSWORD={{MAIL_PASSWORD}}
-MAIL_ADDRESS={{MAIL_ADDRESS}}
-MAIL_NAME={{MAIL_NAME}}
-
-REDIS_HOST={{REDIS_HOST}}
-REDIS_DATABASE={{REDIS_DATABASE}}
-REDIS_PORT={{REDIS_PORT}}
-

docker/crontab

@@ -1,2 +0,0 @@
-#minute hour    mday    month   wday    who         command
-*       *       *       *       *       www-data    php /var/www/html/artisan schedule:run 1>> /dev/null 2>&1

docker/entrypoint.sh

@@ -1,66 +0,0 @@
-#!/bin/bash
-set -e
-
-APP_ENV=${APP_ENV:-local}
-APP_DEBUG=${APP_DEBUG:-true}
-APP_URL=${APP_URL:-http://localhost}
-APP_KEY=${APP_KEY:-SomeRandomString}
-
-DB_DRIVER=${DB_DRIVER:-mysql}
-DB_HOST=${DB_HOST:-mysql}
-DB_DATABASE=${DB_DATABASE:-cachet}
-DB_USERNAME=${DB_USERNAME:-cachet}
-DB_PASSWORD=${DB_PASSWORD:-cachet}
-
-CACHE_DRIVER=${CACHE_DRIVER:-file}
-SESSION_DRIVER=${SESSION_DRIVER:-file}
-QUEUE_DRIVER=${QUEUE_DRIVER:-database}
-
-MAIL_DRIVER=${MAIL_DRIVER:-smtp}
-MAIL_HOST=${MAIL_HOST:-mailtrap.io}
-MAIL_PORT=${MAIL_PORT:-2525}
-MAIL_USERNAME=${MAIL_USERNAME:-null}
-MAIL_PASSWORD=${MAIL_PASSWORD:-null}
-MAIL_ADDRESS=${MAIL_ADDRESS:-null}
-MAIL_NAME=${MAIL_NAME:-null}
-
-REDIS_HOST=${REDIS_HOST:-null}
-REDIS_DATABASE=${REDIS_DATABASE:-null}
-REDIS_PORT=${REDIS_PORT:-null}
-
-# configure env file
-
-sed 's,{{APP_ENV}},'"${APP_ENV}"',g' -i /var/www/html/.env
-sed 's,{{APP_DEBUG}},'"${APP_DEBUG}"',g' -i /var/www/html/.env
-sed 's,{{APP_URL}},'"${APP_URL}"',g' -i /var/www/html/.env
-sed 's,{{APP_KEY}},'"${APP_KEY}"',g' -i /var/www/html/.env
-
-sed 's,{{DB_DRIVER}},'"${DB_DRIVER}"',g' -i /var/www/html/.env
-sed 's,{{DB_HOST}},'"${DB_HOST}"',g' -i /var/www/html/.env
-sed 's,{{DB_DATABASE}},'"${DB_DATABASE}"',g' -i /var/www/html/.env
-sed 's,{{DB_USERNAME}},'"${DB_USERNAME}"',g' -i /var/www/html/.env
-sed 's,{{DB_PASSWORD}},'"${DB_PASSWORD}"',g' -i /var/www/html/.env
-
-sed 's,{{CACHE_DRIVER}},'"${CACHE_DRIVER}"',g' -i /var/www/html/.env
-sed 's,{{SESSION_DRIVER}},'"${SESSION_DRIVER}"',g' -i /var/www/html/.env
-sed 's,{{QUEUE_DRIVER}},'"${QUEUE_DRIVER}"',g' -i /var/www/html/.env
-
-sed 's,{{MAIL_DRIVER}},'"${MAIL_DRIVER}"',g' -i /var/www/html/.env
-sed 's,{{MAIL_HOST}},'"${MAIL_HOST}"',g' -i /var/www/html/.env
-sed 's,{{MAIL_PORT}},'"${MAIL_PORT}"',g' -i /var/www/html/.env
-sed 's,{{MAIL_USERNAME}},'"${MAIL_USERNAME}"',g' -i /var/www/html/.env
-sed 's,{{MAIL_PASSWORD}},'"${MAIL_PASSWORD}"',g' -i /var/www/html/.env
-sed 's,{{MAIL_ADDRESS}},'"${MAIL_ADDRESS}"',g' -i /var/www/html/.env
-sed 's,{{MAIL_NAME}},'"${MAIL_NAME}"',g' -i /var/www/html/.env
-
-sed 's,{{REDIS_HOST}},'"${REDIS_HOST}"',g' -i /var/www/html/.env
-sed 's,{{REDIS_DATABASE}},'"${REDIS_DATABASE}"',g' -i /var/www/html/.env
-sed 's,{{REDIS_PORT}},'"${REDIS_PORT}"',g' -i /var/www/html/.env
-
-#Clear cache
-/usr/bin/php composer.phar install --no-dev -o
-
-echo "Starting supervisord..."
-exec /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf
-
-exit 0

docker/nginx-site.conf

@@ -1,30 +0,0 @@
-server {
-    listen 8000 default; ## Listen for ipv4; this line is default and implied
-
-    # Make site accessible from http://localhost/
-    server_name localhost;
-    root /var/www/html/public;
-
-    index index.html index.htm index.php;
-
-    charset utf-8;
-
-    location / {
-        try_files $uri $uri/ /index.php?$query_string;
-    }
-
-    # Pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
-    location ~ \.php$ {
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        include fastcgi_params;
-        fastcgi_pass 127.0.0.1:9000;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_index index.php;
-        fastcgi_keep_conn on;
-    }
-
-    location ~ /\.ht {
-        deny all;
-    }
-
-}

docker/php-fpm-pool.conf

@@ -1,25 +0,0 @@
-[www]
-user = www-data
-group = www-data
-
-listen = 127.0.0.1:9000
-
-request_terminate_timeout = 120s
-
-pm = dynamic
-pm.max_children = 5
-pm.start_servers = 2
-pm.min_spare_servers = 1
-pm.max_spare_servers = 3
-chdir = /
-
-env[DB_DRIVER] = $DB_DRIVER
-env[DB_HOST] = $DB_HOST
-env[DB_DATABASE] = $DB_DATABASE
-env[DB_USERNAME] = $DB_USERNAME
-env[DB_PASSWORD] = $DB_PASSWORD
-env[CACHE_DRIVER] = $CACHE_DRIVER
-
-
-[global]
-daemonize = no

docker/supervisord.conf

@@ -1,28 +0,0 @@
-[unix_http_server]
-file=/var/run/supervisor.sock   ; (the path to the socket file)
-
-[supervisord]
-logfile=/dev/null             ; (main log file;default $CWD/supervisord.log)
-logfile_maxbytes=0            ; (max main logfile bytes b4 rotation;default 50MB)
-logfile_backups=0             ; (num of main logfile rotation backups;default 10)
-loglevel=info                 ; (log level;default info; others: debug,warn,trace)
-pidfile=/tmp/supervisord.pid  ; (supervisord pidfile;default supervisord.pid)
-nodaemon=true                 ; (start in foreground if true;default false)
-
-; the below section must remain in the config file for RPC
-; (supervisorctl/web interface) to work, additional interfaces may be
-; added by defining them in separate rpcinterface: sections
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[supervisorctl]
-serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
-
-[program:php5-fpm]
-command=/usr/sbin/php5-fpm -c /etc/php5/fpm
-
-[program:nginx]
-command=/usr/sbin/nginx
-
-[program:cron]
-command=/usr/sbin/cron -f

package.json

@@ -2,7 +2,7 @@
     "dependencies": {
         "bower": "~1.4.1",
         "gulp": "~3.9.0",
-        "laravel-elixir": "~3.0.3",
+        "laravel-elixir": "~3.1.1",
         "laravel-elixir-jshint": "~0.1.7"
     },
     "private": true

resources/views/layout/error.blade.php

@@ -21,7 +21,7 @@
 
     <title>{{ isset($page_title) ?: Setting::get('app_name') }}</title>
 
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
+    <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') }}">
 
     @include('partials.stylesheet')

resources/views/layout/master.blade.php

@@ -37,7 +37,7 @@
 
     <title>{{ $page_title }}</title>
 
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
+    <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') }}">
 
     @include('partials.stylesheet')

resources/views/partials/dashboard/head.blade.php

@@ -20,7 +20,7 @@
 
     <title>{{ isset($page_title) ? $page_title : Setting::get('app_name') }} | Cachet</title>
 
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
+    <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') }}">
 
     @include('partials.crowdin')

resources/views/partials/incidents.blade.php

@@ -21,8 +21,7 @@
                             <strong>{{ $incident->name }}</strong>{{ $incident->isScheduled ? trans("cachet.incidents.scheduled_at", ["timestamp" => $incident->scheduled_at_diff]) : null }}
                             <br>
                             <small class="date">
-                                <abbr class="timeago" data-toggle="tooltip" data-placement="right" title="{{ $incident->created_at_formatted }}" data-timeago="{{ $incident->created_at_iso }}">
-                                </abbr>
+                                <abbr class="timeago" data-toggle="tooltip" data-placement="right" title="{{ $incident->timestamp_formatted }}" data-timeago="{{ $incident->timestamp_iso }}"></abbr>
                             </small>
                         </div>
                         <div class="panel-body">

resources/views/partials/metrics.blade.php

@@ -62,7 +62,6 @@
                 new Chart(ctx).Line(data, {
                     tooltipTemplate: "{!! $metric->name !!}: <%= value %>{!! $metric->suffix !!}",
                     scaleShowVerticalLines: true,
-                    scaleShowLabels: false,
                     responsive: true,
                     maintainAspectRatio: false
                 });