Merge pull request #585 from misaochan/master

Versioning and changelog for v2.3

CHANGELOG.md

@@ -1,9 +1,17 @@
 # Wikimedia Commons for Android
 
-## v2.2.2 beta
+## v2.3 beta
+- Add map of Nearby places
+- Add overlay dialog when a Nearby place is tapped
+- Set default number of uploads to display in Main activity as 100, and add option in Settings to change it
+- Detect when 2FA is used for login and display message
+- Display date uploaded and image coordinates in image details page
+- Display message when GPS is turned off, and when no Nearby items are found
+
+## v2.2.2
 - Hotfix for Nearby localization issue
 
-## v2.2.1 beta 
+## v2.2.1
 - Hotfix for Settings crash
 
 ## v2.2 beta (will not be released to Production due to bugs with Settings)

app/build.gradle

@@ -34,8 +34,8 @@ android {
 
     defaultConfig {
         applicationId 'fr.free.nrw.commons'
-        versionCode 69
-        versionName '2.2.2'
+        versionCode 70
+        versionName '2.3'
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"