Merge branch 'release/0.2.5' into develop

tsaiid · Jun 20, 2017 · 7577606 · 7577606
2 parents cc02fbf + b003972
commit 7577606
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,11 @@
+### [0.2.5](/vghks-random-duty/ver/0.2.5/) – 2017-06-20
+
+1. Change event order: duty, holiday, non-duty. (#52)
+2. Upgrade dependency packages.
+3. Use iso week, starting from Monday.
+4. Can calculate week work hours with pm off.
+5. Show alert if cont workday interval is more than 12.
+
 ### [0.2.4](/vghks-random-duty/ver/0.2.4/) – 2016-08-16
 
 1. Show only the DAY instead of MONTH/DAY in 1-month mode. (#51)

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "vghks-random-duty",
   "main": "index.html",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "homepage": "https://github.com/tsaiid/vghks-random-duty",
   "authors": [
     "I-Ta Tsai <[email protected]>"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vghks-random-duty",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "",
   "main": "index.html",
   "scripts": {