Merge tag 'v1.14.0' into development

Release 1.14.0
2015-06-19 22:11:16 +02:00 · 2015-06-19 22:11:16 +02:00 · 50b24b9410
parent a744a4f0d1 bcabb15f53
commit 50b24b9410
2 changed files with 9 additions and 1 deletions
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@ -1,5 +1,13 @@
 = Stop… Camping Time! release news

+== 1.14.0
+
+Features:
+
+* Show customer specific time entries in the customer form [#08650a]
+  * Also allow for registering time for the customer
+* Show a grand total of unbilled hours and amount in the overview
+
 == 1.12.1

 Small update release to include to missing 1.12 change log and added
--- a/stoptime.rb
+++ b/stoptime.rb
@ -54,7 +54,7 @@ end
 module StopTime

  # The version of the application
-  VERSION = '1.12.1'
+  VERSION = '1.14.0'
  puts "Starting Stop… Camping Time! version #{VERSION}"

  # @return [Hash{String=>Object}] The parsed configuration.