Merge branch 'release/1.1.0-rc1'

.goxc.json

@@ -5,9 +5,9 @@
 	],
 	"Arch": "amd64",
 	"Os": "darwin freebsd linux windows",
-	"ResourcesInclude": "README*,LICENSE*,inbucket.bat,etc,themes",
+	"ResourcesInclude": "README*,LICENSE*,CHANGELOG*,inbucket.bat,etc,themes",
 	"PackageVersion": "1.1.0",
-	"PrereleaseInfo": "alpha",
+	"PrereleaseInfo": "rc1",
 	"ConfigVersion": "0.9",
 	"BuildSettings": {
 		"LdFlagsXVars": {

CHANGELOG.md

@@ -0,0 +1,29 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [1.1.0-rc1]
+### Added
+- Inbucket now builds with Go 1.5 or 1.6
+- Project can build & run inside a Docker container
+- Add new default theme based on Bootstrap
+- Your recently accessed mailboxes are listed in the GUI
+- HTML-only messages now get down-converted to plain text automatically
+- This change log
+
+### Changed
+- RESTful API moved to `/api/v1` base URI
+- More graceful shutdown on Ctrl-C or when errors encountered
+
+## [1.0] - 2014-04-14
+### Added
+- Add new configuration option `mailbox.message.cap` to prevent individual
+  mailboxes from growing too large.
+- Add Link button to messages, allows for directing another person to a
+  specific message.
+
+[Unreleased]: https://github.com/jhillyerd/inbucket/compare/1.1.0-rc1...develop
+[1.1.0-rc1]:  https://github.com/jhillyerd/inbucket/compare/1.0...1.1.0-rc1
+[1.0]:        https://github.com/jhillyerd/inbucket/compare/1.0-rc1...1.0
+
+See http://keepachangelog.com/ for instructions on how to update this file.

README.md

@@ -1,4 +1,4 @@
-Inbucket [![Build Status](https://travis-ci.org/jhillyerd/inbucket.png?branch=master)](https://travis-ci.org/jhillyerd/inbucket)
+Inbucket [![Build Status](https://travis-ci.org/jhillyerd/inbucket.png?branch=master)][Build Status]
 ========
 
 Inbucket is an email testing service; it will accept messages for any email
@@ -6,20 +6,19 @@ address and make them available via web, REST and POP3.  Once compiled,
 Inbucket does not have an external dependencies (HTTP, SMTP, POP3 and storage
 are all built in).
 
-Read more at the [Inbucket website][Inbucket]
+Read more at the [Inbucket Website]
 
 Development Status
 ------------------
 
 Inbucket is currently production quality: it is being used for real work.
 
-Please check the [issues list][Issues]
+Please see the [Change Log] and [Issues List] for more details.
-for more details.
 
 Building from Source
-------------------------
+--------------------
 
-You will need a functioning [Go installation][Golang] for this to work.
+You will need a functioning [Go installation][Google Go] for this to work.
 
 Grab the Inbucket source code and compile the daemon:
 
@@ -39,12 +38,14 @@ The Inbucket website has a more complete guide to
 About
 -----
 
-Inbucket is written in [Google Go][Golang].
+Inbucket is written in [Google Go]
 
 Inbucket is open source software released under the MIT License.  The latest
 version can be found at https://github.com/jhillyerd/inbucket
 
-[Inbucket]: http://www.inbucket.org/
+[Build Status]:     https://travis-ci.org/jhillyerd/inbucket
-[Issues]: https://github.com/jhillyerd/inbucket/issues?state=open
+[Change Log]:       https://github.com/jhillyerd/inbucket/blob/master/CHANGELOG.md
-[From Source]: http://www.inbucket.org/installation/from-source.html
+[From Source]:      http://www.inbucket.org/installation/from-source.html
-[Golang]: http://golang.org/
+[Google Go]:        http://golang.org/
+[Inbucket Website]: http://www.inbucket.org/
+[Issues List]:      https://github.com/jhillyerd/inbucket/issues?state=open

inbucket.go

@@ -21,7 +21,7 @@ import (
 
 var (
 	// VERSION contains the build version number, populated during linking by goxc
-	VERSION = "1.1.0.snapshot"
+	VERSION = "1.1.0-rc1"
 
 	// BUILDDATE contains the build date, populated during linking by goxc
 	BUILDDATE = "undefined"