summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2014-02-12 13:23:56 -0800
committerSean Leonard <meanderingcode@aetherislands.net>2014-02-12 13:23:56 -0800
commite6149d1d9ef77409e84d5982a92dd727f0bae2f7 (patch)
treeb01b9fed99fe96f3dda5039c930593f5bae99ea0
parent2c9eb75a98927a85f93079b9a78a1826a718b1ea (diff)
parent549bcb62496fbf1f48bfc195716b035c5b6e11e7 (diff)
Merge branch 'release-0.4'0.4
-rw-r--r--AndroidManifest.xml4
-rw-r--r--CHANGELOG16
2 files changed, 17 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 25b78bd6..815ddf87 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,8 +17,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="se.leap.bitmaskclient"
- android:versionCode="64"
- android:versionName="0.2.3" >
+ android:versionCode="67"
+ android:versionName="0.4" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/CHANGELOG b/CHANGELOG
index b0f0d8e0..7b635a06 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,18 @@
-0.2.3-rc1 Nov 29 2013
+0.4 Feb 10 2014
+Features
+- Use token based authentication
+- UI Improvements
+- Show location of VPN gateway
+- About view is now an Activity
+- Removed ics-openvpn references and unused code
+Bugs Fixed
+- Improved handling of Configuration Wizard errors
+- Use strong cert pinning for provider
+- Progress bars layout
+- References to "LEAP Android" changed to Bitmask
+- Login/logout messages clear when complete
+
+0.2.3 Nov 29 2013
Features
- Begin integrating tests into repository
- Clearer wording in some places