diff --git a/README.md b/README.md index 60753e203..c37b9d366 100644 --- a/README.md +++ b/README.md @@ -8,18 +8,18 @@ ![Screenshot](https://cachethq.io/img/main-interface.jpg) -**Currently in development. Things may change or break until a solid release has been announced.** - ## Features -- List your services components. -- Log incidents. -- Apply a custom stylesheet to the status page. -- Markdown support for incident messages. -- RESTful API. -- Translated into several languages. -- Metrics. -- Cross-database support: MySQL, PostgreSQL and SQLite. +- List your services components +- Log incidents +- Apply custom CSS to the status page +- Markdown support for incident messages +- JSON API +- Translated into eleven languages +- Metrics +- Cross-database support: MySQL, PostgreSQL and SQLite +- Subscriber notifications via Email +- Two factor authentication, with Google Authenticator ## Requirements @@ -28,17 +28,15 @@ ### Development Requirements -The following extra dependencies are required to develop Cachet. +The following extra dependencies are required to develop Cachet: - Node.js - + Bower - + Gulp +- Bower +- Gulp ## Installation, Upgrades and Documentation -You can now find our documentation at [https://docs.cachethq.io](https://docs.cachethq.io) or, directly at [http://cachet.readme.io](http://cachet.readme.io) if the first link fails to load. [Cachet Demo](https://demo.cachethq.io). - -If you're upgrading from an earlier version of Cachet, which uses Laravel 4 then you'll need to follow the upgrade instructions [found here](https://docs.cachethq.io/v1.0/docs/upgrading-from-laravel-4). +You can now find our documentation at [https://docs.cachethq.io](https://docs.cachethq.io). ### Demo Account @@ -47,7 +45,7 @@ To test out the demo, you may login to the [Dashboard](https://demo.cachethq.io/ - **Username:** test@test.com - **Password:** test123 -The demo is reset every half past the hour. +The demo is reset every half hour. ## What Cachet is not @@ -87,6 +85,7 @@ 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 diff --git a/composer.lock b/composer.lock index 0849916e2..1d2a0fe78 100644 --- a/composer.lock +++ b/composer.lock @@ -1897,16 +1897,16 @@ }, { "name": "monolog/monolog", - "version": "1.13.1", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac" + "reference": "b287fbbe1ca27847064beff2bad7fb6920bf08cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c31a2c4e8db5da8b46c74cf275d7f109c0f249ac", - "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/b287fbbe1ca27847064beff2bad7fb6920bf08cc", + "reference": "b287fbbe1ca27847064beff2bad7fb6920bf08cc", "shasum": "" }, "require": { @@ -1917,12 +1917,14 @@ "psr/log-implementation": "1.0.0" }, "require-dev": { - "aws/aws-sdk-php": "~2.4, >2.4.8", + "aws/aws-sdk-php": "^2.4.9", "doctrine/couchdb": "~1.0@dev", "graylog2/gelf-php": "~1.0", - "phpunit/phpunit": "~4.0", - "raven/raven": "~0.5", - "ruflin/elastica": "0.90.*", + "php-console/php-console": "^3.1.3", + "phpunit/phpunit": "~4.5", + "phpunit/phpunit-mock-objects": "2.3.0", + "raven/raven": "~0.8", + "ruflin/elastica": ">=0.90 <3.0", "swiftmailer/swiftmailer": "~5.3", "videlalvaro/php-amqplib": "~2.4" }, @@ -1932,6 +1934,7 @@ "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", "ext-mongo": "Allow sending log messages to a MongoDB server", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", + "php-console/php-console": "Allow sending log messages to Google Chrome", "raven/raven": "Allow sending log messages to a Sentry server", "rollbar/rollbar": "Allow sending log messages to Rollbar", "ruflin/elastica": "Allow sending log messages to an Elastic Search server", @@ -1940,7 +1943,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13.x-dev" + "dev-master": "1.14.x-dev" } }, "autoload": { @@ -1966,7 +1969,7 @@ "logging", "psr-3" ], - "time": "2015-03-09 09:58:04" + "time": "2015-06-19 13:29:54" }, { "name": "mtdowling/cron-expression",