summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2014-03-02Remove stowaway values-nl folder that was commited to res/values/ folderSean Leonard
2014-03-02Transifex configurationSean Leonard
2014-03-02Merge branch 'bug/remove-settings-menu' into developSean Leonard
2014-03-02Remove obviated settings entry from Dashboard menuSean Leonard
2014-03-01Merge branch 'feature/timezone-vpn-gateway-selection' into developSean Leonard
2014-03-01Explicit startService() for updating EIP definitionsSean Leonard
2014-03-01Better host matching when updating gateways listSean Leonard
2014-03-01Select VPN gateway by least timezone differenceSean Leonard
2014-02-28Merge branch 'bug/about-fragment-legacy-references' into developSean Leonard
2014-02-28Merge branch 'feature/remove-shared-preferences-methods-from-ConfigHelper' ↵Sean Leonard
into develop Conflicts: src/se/leap/bitmaskclient/Dashboard.java
2014-02-12Merge branch 'release-0.4'0.4Sean Leonard
2014-02-12Bump build and version number for releaseSean Leonard
2014-02-12changelogSean Leonard
2014-02-10Remove "RC" from 0.2.3 release notesSean Leonard
2014-02-07Bump build and version number for RC2Sean Leonard
2014-02-07Bump build and version number for RCSean Leonard
2014-02-07Merge branch 'bug/login-logout-messages' into developSean Leonard
2014-02-07bugfix 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 )
2014-02-04Merge branch 'feature/remove-legacy-ics-openvpn-classes-that-wont-be-used' ↵Sean Leonard
into develop Also merge branch 'feature/change-or-remove-user-facing-references-to-ics-android' into develop
2014-02-04Remove launch log function and click listener from EIP status line.Sean Leonard
Log window Activity is gone with ics-openvpn purge. We will want it back, but we will bring back only what's needed.
2014-02-04Forgot to refactor string name in real code.Parménides GV
2014-02-04No more references to ics openvpn.Parménides GV
I've refactored a string name and the content of that string so that no references to legacy ics-openvpn user interface are present in there.
2014-02-04Lint performance: completely cleanSean Leonard
That means there is no unnecessary file, nor resource, in the project right now. Conflicts: res/values-ca/strings.xml res/values-cs/strings.xml res/values-de/strings.xml res/values-es/strings.xml res/values-et/strings.xml res/values-fr/strings.xml res/values-id/strings.xml res/values-it/strings.xml res/values-ja/strings.xml res/values-ko/strings.xml res/values-nl/strings.xml res/values-no/strings.xml res/values-ro/strings.xml res/values-ru/strings.xml res/values-uk/strings.xml res/values-zh-rCN/strings.xml res/values-zh-rTW/strings.xml res/values/strings.xml res/values/untranslatable.xml res/xml/main_headers.xml
2014-02-04Concordant AndroidManifest.Parménides GV
2014-02-04More unused classes wiped.Parménides GV
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 00:40:28 +0000