bitmask_android.git/src/se, branch 0.4

bugfix for #4664 and #4668 (login/logout messages)

2014-02-07T22:46:37+00:00

Conflicts:
	src/se/leap/bitmaskclient/ProviderAPI.java
	res/values/strings.xml (Re-add lines removed in 7297632a01d5fb606b901d8c54e190e28b95716e )

Remove launch log function and click listener from EIP status line.

2014-02-05T02:06:46+00:00

Log window Activity is gone with ics-openvpn purge.
We will want it back, but we will bring back only what's needed.

Forgot to refactor string name in real code.

2014-02-05T01:33:49+00:00

More unused classes wiped.

2014-02-05T00:56:39+00:00

Deleted unused classes from ics-openvpn.

2014-02-05T00:56:31+00:00

This classes were an obvious choice, there may be more unused classes
around there.

Conflicts:
	src/se/leap/bitmaskclient/ProviderListFragment.java

there's no about fragment anymore

2013-12-21T00:06:35+00:00

Merge branch 'bug/more-detailed-response-to-CW-errors' into develop

2013-12-20T23:38:00+00:00

Merge branch 'feature/token-based-auth' into develop

2013-12-20T19:25:48+00:00

Conflicts:
	src/se/leap/bitmaskclient/ConfigurationWizard.java
	src/se/leap/bitmaskclient/Dashboard.java
	src/se/leap/bitmaskclient/ProviderAPI.java
	src/se/leap/bitmaskclient/ProviderListFragment.java

Merge branch 'feature/UI_improvements' into develop

2013-12-19T20:11:22+00:00

Correct the location name in the notification (Bug #4660)

2013-12-16T22:11:41+00:00