Merge pull request #2 from hollodotme/dev

[WIP] Milestone v1.1.3

CHANGELOG

@@ -1,10 +1,50 @@
-# CHANGELOG
+# Change Log
 
-## Changes in Version 1.1.1
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a CHANGELOG](http://keepachangelog.com).
 
-* Number of database is displayed, even when an expressive name is mapped
-* Fixed missing whitespace in default database name
+## [1.1.3] - 2017-01-03
 
-## Changes in Version 1.1.0
+### Fixed
 
-* Added database mapping for more expressive database names. See [README](./README.md) for more details.
+ * Abandoned dependency to `fortuneglobe/icehawk` (now `icehawk/icehawk`) - [#1](https://github.com/hollodotme/readis/issues/1)
+ * Updated all composer dependencies and .lock file
+
+## [1.1.2] - 2016-03-03
+
+### Fixed
+
+ * Removed hard-coded test data
+
+## [1.1.1] - 2016-02-03
+
+### Added
+
+ * Number of database is displayed, even when an expressive name is mapped
+
+### Fixed
+
+ * Missing whitespace in default database name
+
+## [1.1.0] - 2016-01-30
+
+### Added
+
+ * Database mapping for more expressive database names.
+	See [README](https://github.com/hollodotme/readis/blob/v1.1.0/README.md#sample-server-configuration) for more details.
+
+## [1.0.1] - 2015-12-16
+
+### Fixed
+
+ * Default settings in `config/app.sample.php`
+
+## [1.0.0] - 2015-12-06
+
+First stable release.
+
+[1.1.2]: https://github.com/hollodotme/readis/compare/v1.1.1...v1.1.2
+[1.1.1]: https://github.com/hollodotme/readis/compare/v1.1.0...v1.1.1
+[1.1.0]: https://github.com/hollodotme/readis/compare/v1.0.1...v1.1.0
+[1.0.1]: https://github.com/hollodotme/readis/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/hollodotme/readis/tree/v1.0.0

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Holger Woltersdorf
+Copyright (c) 2015-2017 Holger Woltersdorf
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -1,33 +1,33 @@
 {
-  "name": "hollodotme/readis",
-  "description": "A web interface to read data from redis server(s)",
-  "minimum-stability": "dev",
-  "prefer-stable": true,
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "Holger Woltersdorf",
-      "email": "[email protected]"
-    }
-  ],
-  "support": {
-    "email": "[email protected]",
-    "source": "https://github.com/hollodotme/readis"
-  },
-  "require": {
-    "php": ">=5.5",
-    "ext-redis": "*",
-    "fortuneglobe/icehawk": "1.4.0",
-    "twig/twig": "@stable"
-  },
-  "autoload": {
-    "psr-4": {
-      "hollodotme\\Readis\\": "src/"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "hollodotme\\Readis\\Tests\\Unit\\": "tests/Unit/"
-    }
-  }
+	"name": "hollodotme/readis",
+	"description": "A web interface to read data from redis server(s)",
+	"minimum-stability": "dev",
+	"prefer-stable": true,
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "Holger Woltersdorf",
+			"email": "[email protected]"
+		}
+	],
+	"support": {
+		"email": "[email protected]",
+		"source": "https://github.com/hollodotme/readis"
+	},
+	"require": {
+		"php": ">=5.5",
+		"ext-redis": "*",
+		"icehawk/icehawk": "1.4.2",
+		"twig/twig": "^1.30"
+	},
+	"autoload": {
+		"psr-4": {
+			"hollodotme\\Readis\\": "src/"
+		}
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"hollodotme\\Readis\\Tests\\": "tests/"
+		}
+	}
 }