| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2014-03-26 | Merge branch 'develop' into release-0.5 | Parménides GV | |
| 2014-03-25 | Merge branch 'bug/replace-bitmask.net-provider-with-demo.bitmask.net' into ↵ | Parménides GV | |
| develop | |||
| 2014-03-25 | bitmask is dead: long life to demo.bitmask! | Parménides GV | |
| 2014-03-20 | Merge branch 'bug/testOnOffOpenVpn-testDashboard.java-line-47-fails-#5354' ↵ | Parménides GV | |
| into develop | |||
| 2014-03-20 | Tests 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-19 | Merge 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-19 | Merge branch 'bug/no-support-library-in-tests' into develop | Parménides GV | |
| I merge myself because I need to show how I'm doing tests before people can start reviewing them. | |||
| 2014-03-19 | Android 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-18 | Merge remote-tracking branch ↵ | cyBerta | |
| 'parmegv/bug/app-crashes-if-there-is-no-anonymous-certificate-#5310' into develop | |||
| 2014-03-18 | Merge branch 'bug/connection-to-calyx.net-fails-and-app-crashes-#4550' into ↵ | cyBerta | |
| develop | |||
| 2014-03-13 | Token correctly sent in the http request. | Parménides GV | |
| 2014-03-12 | Merge branch 'feature/about-view-transifex-link' into develop | Parménides GV | |
| 2014-03-12 | Default translationby to Arne and English. | Parménides GV | |
| 2014-03-12 | Merge branch 'bug/sometimes-dashboard-ui-doesnt-get-built-properly-#5198' ↵ | Sean Leonard | |
| into develop | |||
| 2014-03-12 | Add Transifex link to About View | Sean Leonard | |
| 2014-03-12 | Remove crowdin.net references | Sean Leonard | |
| 2014-03-12 | Merge branch 'bug/dying-client-during-configuration-5237' into develop | Sean Leonard | |
| 2014-03-12 | Login action bar button shown when applicable. | Parménides GV | |
| 2014-03-11 | Locations in eip-service can be empty. | Parménides GV | |
| 2014-03-10 | ConcurrentModification at switching provider fixed | Parménides GV | |
| This fixes bug 5237. | |||
| 2014-03-10 | Merge branch 'bug/top-padding-5260' into develop | Parménides GV | |
| 2014-03-10 | A 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-08 | Remove 'Top padding' string from ConfigurationWizard (Bug #5260) | root | |
| 2014-03-08 | Merge branch 'correction_in_readme' into develop | Parménides GV | |
| 2014-03-08 | corrected link for 'building from eclipse' in README.md | Ankush | |
| 2014-03-05 | Merge branch 'bug/inaccurate-server-down-msg' into develop | Sean Leonard | |
| 2014-03-05 | Merge branch 'bug/spelling' of into develop | Sean Leonard | |
| 2014-03-05 | Rewrite "Server is down" message to "Server is unreachable" | Sean Leonard | |
| 2014-03-05 | typo | kwadronaut | |
| 2014-03-02 | Bump build and version number for RC1 | Sean Leonard | |
| 2014-03-02 | changelog release flavor text added | Sean Leonard | |
| 2014-03-02 | Merge branch 'feature/transifex-configuration' into develop | Sean Leonard | |
| 2014-03-02 | Remove stowaway values-nl folder that was commited to res/values/ folder | Sean Leonard | |
| 2014-03-02 | Transifex configuration | Sean Leonard | |
| 2014-03-02 | Merge branch 'bug/remove-settings-menu' into develop | Sean Leonard | |
| 2014-03-02 | Remove obviated settings entry from Dashboard menu | Sean Leonard | |
| 2014-03-01 | Merge branch 'feature/timezone-vpn-gateway-selection' into develop | Sean Leonard | |
| 2014-03-01 | Explicit startService() for updating EIP definitions | Sean Leonard | |
| 2014-03-01 | Better host matching when updating gateways list | Sean Leonard | |
| 2014-03-01 | Select VPN gateway by least timezone difference | Sean Leonard | |
| 2014-02-28 | Merge branch 'bug/about-fragment-legacy-references' into develop | Sean Leonard | |
| 2014-02-28 | Merge branch 'feature/remove-shared-preferences-methods-from-ConfigHelper' ↵ | Sean Leonard | |
| into develop Conflicts: src/se/leap/bitmaskclient/Dashboard.java | |||
| 2014-02-12 | Merge branch 'release-0.4'0.4 | Sean Leonard | |
| 2014-02-12 | Bump build and version number for release | Sean Leonard | |
| 2014-02-12 | changelog | Sean Leonard | |
| 2014-02-10 | Remove "RC" from 0.2.3 release notes | Sean Leonard | |
| 2014-02-07 | Bump build and version number for RC2 | Sean Leonard | |
| 2014-02-07 | Bump build and version number for RC | Sean Leonard | |
| 2014-02-07 | Merge branch 'bug/login-logout-messages' into develop | Sean Leonard | |
| 2014-02-07 | bugfix for #4664 and #4668 (login/logout messages) | Sean Leonard | |
| Conflicts: src/se/leap/bitmaskclient/ProviderAPI.java res/values/strings.xml (Re-add lines removed in 7297632a01d5fb606b901d8c54e190e28b95716e ) | |||
 |
index : bitmask_android.git | |
| [bitmask_android] | git repository hosting |
| summaryrefslogtreecommitdiff |