Merge tag 'v1.3.0' into dev

Release v1.3.0
codenpk · Mar 12, 2016 · 8c45f52 · 8c45f52
2 parents 5e4a405 + 53c9dca
commit 8c45f52
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+### 1.3.0 (March 12, 2016)
+
+* New frequency plot: view total repetitions per day of week
+* New history editor: put checkmarks in the past
+* German, French and Japanese translations
+* Add about screen, with credits to all contributors
+* Fix small bug that prevented habit from being reordered
+* Fix small bug caused by rotating the device
+
 ### 1.2.0 (March 4, 2016)
 
 * Ability to export habit data as CSV

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,8 +21,8 @@
 <manifest
     package="org.isoron.uhabits"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="9"
-    android:versionName="1.2.0">
+    android:versionCode="10"
+    android:versionName="1.3.0">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
 

diff --git a/screenshots/original/uhabits2.png b/screenshots/original/uhabits2.png
diff --git a/screenshots/original/uhabits3.png b/screenshots/original/uhabits3.png
diff --git a/screenshots/original/uhabits4.png b/screenshots/original/uhabits4.png
diff --git a/screenshots/thumbs/uhabits2.png b/screenshots/thumbs/uhabits2.png
diff --git a/screenshots/thumbs/uhabits3.png b/screenshots/thumbs/uhabits3.png
diff --git a/screenshots/thumbs/uhabits4.png b/screenshots/thumbs/uhabits4.png