summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-04-07 17:00:46 +0200
committerParménides GV <parmegv@sdf.org>2014-04-07 17:00:46 +0200
commit910b0e1746ab3f63e63808b198ad51fec5b635e5 (patch)
treed2edee1019409e411e9ea66d037c7c768501bec9
parentb799ea39c1ef8750ac21390e93fdc935a1ebc693 (diff)
parent3cf41affabb2d5f5e68ecddd0a8d349d210c0e0e (diff)
Merge branch 'release-0.5' into develop0.5
-rw-r--r--AndroidManifest.xml4
-rw-r--r--CHANGELOG25
-rw-r--r--project.properties2
3 files changed, 26 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6738a90c..e14fe5cd 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="67"
- android:versionName="0.4" >
+ android:versionCode="74"
+ android:versionName="0.5" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/CHANGELOG b/CHANGELOG
index 7b635a06..f6ffdc0e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,25 @@
-0.4 Feb 10 2014
+0.5 April 4 2014 - the "soft winds" release
+Features
+- Replace bitmask.net with demo.bitmask.net
+- Transifex URL added to the About page
+Bugs Fixed
+- Tests run without problems from ant
+- Calyx.net and all registered-only EIP providers works correctly once logged in.
+- Menu gets built correctly from the beginning
+- Switching provider doesn't crash the app
+- Removed an unnecessary string from strings.xml
+- Link to the "Building with Eclipse" file corrected.
+- Clearer message when the provider isn't reachable.
+- Android NDK r9d support added
+- EIP switch doesn't toggle off momentarily while starting VPN
+- About text more readable: space between display's border and text
+- Font sizes scaled up for 10' devices
+- Cancelling a provider setup doesn't crash anymore
+- Providers that only offer authenticated EIP work ok
+- Cancelling a provider setup shows the complete provider list again
+- Providers cannot be added twice.
+
+0.4 Feb 10 2014 - the "early spring cleaning" release
Features
- Use token based authentication
- UI Improvements
@@ -12,7 +33,7 @@ Bugs Fixed
- References to "LEAP Android" changed to Bitmask
- Login/logout messages clear when complete
-0.2.3 Nov 29 2013
+0.2.3 Nov 29 2013 - the "three is a magic number" release
Features
- Begin integrating tests into repository
- Clearer wording in some places
diff --git a/project.properties b/project.properties
index c4f09d2b..a5578ba0 100644
--- a/project.properties
+++ b/project.properties
@@ -8,4 +8,4 @@
# project structure.
# Project target.
-target=android-17
+target=android-19