summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2013-12-04 19:43:41 -0800
committerSean Leonard <meanderingcode@aetherislands.net>2013-12-04 19:43:49 -0800
commitb1dacaa6f0131193e04c10327a07f778a67b6d12 (patch)
tree6abc54edd8d7db9a78bef4732e63ae4ffa0940e6
parent6f31f91a82f9822a34ae55c5275130d23be29f4b (diff)
parent73e6fe619ce54d0845dcd18e41bc5a7545c9f774 (diff)
Merge branch 'release-0.2.3'0.2.3
-rw-r--r--AndroidManifest.xml4
-rw-r--r--CHANGELOG13
2 files changed, 15 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2cb8766e..bb788109 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="62"
- android:versionName="0.2.2" >
+ android:versionCode="64"
+ android:versionName="0.2.3" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/CHANGELOG b/CHANGELOG
index 09ad9761..b0f0d8e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,14 @@
+0.2.3-rc1 Nov 29 2013
+Features
+- Begin integrating tests into repository
+- Clearer wording in some places
+- Show VPN Gateway location in notification
+Bugs Fixed
+- URL parsing error if http entered for custom provider
+- Issues with certificates and gateways when switching providers
+- SEVERE: Routes were not set on VPN connection and traffic was routed in the clear
+
+
0.2.2 - Nov 15 2013 - the "rampant growth" release:
Features
- Rebranded to Bitmask
@@ -11,6 +22,8 @@ Bugs Fixed
- Complex certificate verification
- Remember authentication status
- Widget shortcut crashes app
+
+
0.2.1 - Oct 21 2013 - the "get on that rolling bandwagon" release:
Bugs Fixed
- SRP tests should be runnable localhost