summaryrefslogtreecommitdiff
path: root/app/src/main
AgeCommit message (Collapse)Author
2018-02-25Merge branch '0xacab_0.9.8' into 8865_cancel_without_internetFup Duck
2018-02-25Merge branch '8868_ui_lollipop' into 0xacab_0.9.8Fup Duck
* redo merge https://0xacab.org/leap/bitmask_android/merge_requests/53
2018-02-25Merge branch '8851_remove_menu' into 0xacab_0.9.8Fup Duck
* redo merge https://0xacab.org/leap/bitmask_android/merge_requests/49
2018-02-258865 - set correct route as in 8824Fup Duck
2018-02-258865 - fix ics_openvpnFup Duck
2018-02-258865 - resolve discussionsFup Duck
2018-02-25Merge branch '0xacab_0.9.8' into 8865_cancel_without_internetFup Duck
2018-02-228868 - fix lollipop ui issuesFup Duck
2018-02-228867 - add url to usernameFup Duck
2018-02-228865 - allow disconnect without internetFup Duck
2018-02-228851 - remove options menuFup Duck
2018-02-22Merge branch '#8861_splash_screen_handling' into '0.9.8'fupduck
#8861 fix splash screen handling See merge request leap/bitmask_android!48
2018-02-21Merge branch '#8858_persist_custom_providers' into '0.9.8'fupduck
#8858 persist custom providers See merge request leap/bitmask_android!47
2018-02-21#8861 fix splash screen handlingcyBerta
2018-02-21#8858 write tests for ProviderManager and some related refactoringscyBerta
2018-02-21#8858 add custom providers to the providers list on successful setupcyBerta
2018-02-20#8853 fix provider setup with codigosur.orgcyBerta
2018-02-20#8853 fix signup for providers that allow only user authed vpncyBerta
2018-02-20#8853 improve backend callback check for error responsescyBerta
2018-02-20#8860 fix potential nullpointer exception on openvpnservicecyBerta
2018-02-19fix invalid vpn user messagecyBerta
2018-02-19set version name to 0.9.8RC20.9.8RC2cyBerta
2018-02-19fix gateway selectioncyBerta
2018-02-19add current translationscyBerta
2018-02-18#8852 fix api urls for signup and logoutcyBerta
2018-02-18#8852 improve signup error handling for backend error messagescyBerta
2018-02-18#8852 pass provider to signup method as parametercyBerta
2018-02-18Merge branch 'mirror_0xacab_0.9.8' into #8797_certificate_expirationcyBerta
* fix merge conflicts in: app/src/main/java/se/leap/bitmaskclient/EipFragment.java app/src/main/java/se/leap/bitmaskclient/eip/EIP.java app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java
2018-02-18handle intent action in MainActivitys onCreatecyBerta
2018-02-18#8857 fix recreation / restore of ConfigurationWizard error dialogscyBerta
2018-02-17#8797 fix recreation / restore of MainActivityErrorDialogscyBerta
2018-02-16#8857 fix dialog recreation in EipFragmentcyBerta
2018-02-16#8797 change javadoc header in MainActivityErrorDialogcyBerta
2018-02-16Merge branch '#8831_progress_animation_when_connecting' into '0.9.8'cyberta
#8831 progress animation when connecting See merge request leap/bitmask_android!43
2018-02-16#8852 code review changescyBerta
2018-02-16Merge branch 'leap_0.9.8' into #8797_certificate_expirationFup Duck
2018-02-16Merge branch '#8846_remove_Dashboard' into '0.9.8'fupduck
#8846 remove legacy code and files: Dashboard, LogWindow, UserStatusFragment,… See merge request leap/bitmask_android!44
2018-02-158797 - pair programming effortFup Duck
2018-02-14#8854 set Provider as argument for EipFragmentcyBerta
2018-02-14#8846 remove legacy code and files: Dashboard, LogWindow, ↵cyBerta
UserStatusFragment, FabButton library etc.
2018-02-13#8831 add a fadeout animation for the progressbarcyBerta
2018-02-13Merge branch 'origin_0.9.8' into #8831_progress_animation_when_connectingcyBerta
* added new EipCommand in StartActivity * added option to add intent extras to EipCommand * resolved merge conflicts and minor refactorings in: app/src/main/java/se/leap/bitmaskclient/EipFragment.java app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
2018-02-13update targetSdkFup Duck
2018-02-138827 - add mockConfigHelpperFup Duck
2018-02-13Merge branch 'leap_0.9.8' into 8827_handle_switch_providerFup Duck
2018-02-13#8831 smoothing progressbar a little bitcyBerta
2018-02-13#8831 add a progress animation to EipFragment and don't start blocking vpn ↵cyBerta
when user triggered vpn start from UI
2018-02-128827 - remove caCertificate from ProviderFup Duck
It's already represented by CertificatePin & CertificatePinEncoding
2018-02-128827 - fix equals for ProviderFup Duck
2018-02-12#8837 update tests and fix VPN_Paused implementation for EipStatuscyBerta