Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
develop
|
|
|
|
into develop
|
|
Setting the mobile data connection off cuts the connection from the computer to the emulator, so ant nor adb will see everything's well unless you comment that part of the tests (testDashboard:52-60).
|
|
develop_test
Conflicts:
AndroidManifest.xml
tests/src/se/leap/bitmaskclient/test/testDashboard.java
|
|
I merge myself because I need to show how I'm doing tests before people can start reviewing them.
|
|
Look at https://leap.se/code/issues/5062#note-3:
I'm going to remove android-support-v4.jar from .gitignore based on https://developer.android.com/tools/support-library/index.html#overview and http://www.in-nomine.org/2012/02/26/adding-android-support-v4-to-your-android-application-in-intellij-idea/
|
|
'parmegv/bug/app-crashes-if-there-is-no-anonymous-certificate-#5310' into develop
|
|
develop
|
|
|
|
|
|
|
|
into develop
|
|
|
|
|
|
|
|
|
|
|
|
This fixes bug 5237.
|
|
|
|
I've added "from providerlistfragment" just in case there is any other "top padding" string suitable in other class in the future.
I've removed the auxiliar variable in the block of code from ProviderListFragment, there is no need of if now we have a constant in that class.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
into develop
Conflicts:
src/se/leap/bitmaskclient/Dashboard.java
|
|
|
|
|
|
|
|
|
|
|
|
|