summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-01Merge branch ↵Parménides GV
'bug/cancelling-a-provider-setup-doesn't-show-the-complete-provider-list-again-5418' into develop
2014-04-01Show all providers when a user cancels one's setupParménides GV
2014-03-31Merge branch 'bug/Crash-if-the-chosen-provider-doesn't-offer-eip-5402' into ↵Parménides GV
develop
2014-03-31EIP detection returns false if exception happens.Parménides GV
hasEIP method didn't return false if JSONException happened, and that occurred when a provider didn't offer EIP (right now, cdev doesn't offer EIP).
2014-03-29Merge branch 'bug/cannot-configure-Calyx-nor-dev.bm-#5397' into developParménides GV
2014-03-29Setting up provider finishes with use_anon/log_inParménides GV
I was telling the app that the user stopped setting a provider before s/he actually tapped the login/use anonymously button from Provider Details.
2014-03-29Merge branch 'bug/incomplete-configuration-crash' into developParménides GV
2014-03-29Pressing back always returns to CW.Parménides GV
This commit fixes a problem when back was pressed when the vpn certificate had been already downloaded (2/3 of the progressbar).
2014-03-29Refactored.Parménides GV
2014-03-29Back button while setting up a provider worksParménides GV
It stops the process, you can restart it as usual, but if you press back again you quit the app because there is no chosen provider.
2014-03-29Merge branch 'bug/font-size-too-small-for-10'-devices-#5211' into developParménides GV
2014-03-29Edit texts from login and new provider scaled up.Parménides GV
Built-in buttons and titles/messages aren't scaled up, it should be programatically but I think that preference should be inherited from Android configuration rather. If every app chose those sizes, then the overall Android feeling wouldn't be homogeneous.
2014-03-29About fragment text scaled up.Parménides GV
Just that.
2014-03-29Configuration Wizard sized for tablets.Parménides GV
Including provider details.
2014-03-29Dashboard for 10' screens.Parménides GV
2014-03-29Merge branch 'bug/no-space-between-display's-border-and-about-text-#5199' ↵Parménides GV
into develop
2014-03-29Left margin in the about text = 8spParménides GV
2014-03-29Merge branch ↵Parménides GV
'bug/eip-switch-toggles-off-momentarily-while-starting-VPN-#3161' into develop
2014-03-29Eip starting => don't turn off the switch on EXIT.Parménides GV
This fixes #3161.
2014-03-29Merge branch 'bug/openvpn-binaries-don't-compile-with-ndk-r9d-#5320' into ↵Parménides GV
develop
2014-03-25Merge branch 'bug/replace-bitmask.net-provider-with-demo.bitmask.net' into ↵Parménides GV
develop
2014-03-25bitmask is dead: long life to demo.bitmask!Parménides GV
2014-03-20Merge branch 'bug/testOnOffOpenVpn-testDashboard.java-line-47-fails-#5354' ↵Parménides GV
into develop
2014-03-20Tests for Dashboard pass.Parménides GV
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).
2014-03-19Merge branch 'feature/simulate-no-network-without-airplane-mode' into ↵Parménides GV
develop_test Conflicts: AndroidManifest.xml tests/src/se/leap/bitmaskclient/test/testDashboard.java
2014-03-19Merge branch 'bug/no-support-library-in-tests' into developParménides GV
I merge myself because I need to show how I'm doing tests before people can start reviewing them.
2014-03-19Android support library v4 added.Parménides GV
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/
2014-03-19Compiles with r9d.Parménides GV
Tested in emulators with APIs 14, 15, 16 and 18.
2014-03-18Merge remote-tracking branch ↵cyBerta
'parmegv/bug/app-crashes-if-there-is-no-anonymous-certificate-#5310' into develop
2014-03-18Merge branch 'bug/connection-to-calyx.net-fails-and-app-crashes-#4550' into ↵cyBerta
develop
2014-03-13Token correctly sent in the http request.Parménides GV
2014-03-12Merge branch 'feature/about-view-transifex-link' into developParménides GV
2014-03-12Default translationby to Arne and English.Parménides GV
2014-03-12Merge branch 'bug/sometimes-dashboard-ui-doesnt-get-built-properly-#5198' ↵Sean Leonard
into develop
2014-03-12Add Transifex link to About ViewSean Leonard
2014-03-12Remove crowdin.net referencesSean Leonard
2014-03-12Merge branch 'bug/dying-client-during-configuration-5237' into developSean Leonard
2014-03-12Login action bar button shown when applicable.Parménides GV
2014-03-11Locations in eip-service can be empty.Parménides GV
2014-03-10ConcurrentModification at switching provider fixedParménides GV
This fixes bug 5237.
2014-03-10Merge branch 'bug/top-padding-5260' into developParménides GV
2014-03-10A bit more clean and concise.Parménides GV
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.
2014-03-08Remove 'Top padding' string from ConfigurationWizard (Bug #5260)root
2014-03-08Merge branch 'correction_in_readme' into developParménides GV
2014-03-08corrected link for 'building from eclipse' in README.mdAnkush
2014-03-05Merge branch 'bug/inaccurate-server-down-msg' into developSean Leonard
2014-03-05Merge branch 'bug/spelling' of into developSean Leonard
2014-03-05Rewrite "Server is down" message to "Server is unreachable"Sean Leonard
2014-03-05typokwadronaut
2014-03-02Merge branch 'feature/transifex-configuration' into developSean Leonard