summaryrefslogtreecommitdiff
path: root/app/src/main/java
AgeCommit message (Collapse)Author
2018-03-17#8878 fix back button behavior for about and log screencyBerta
2018-03-06Merge branch 'cleanup' into 'master'cyberta
cleanup - rename layout files See merge request leap/bitmask_android!64
2018-03-06cleanup - rename layout filesFup Duck
2018-03-056117 - show cancel if no connectionFup Duck
2018-03-02#8808 adds an optional dialog that shows instruction hints for always-on vpncyBerta
2018-02-28#8808 add dialog for always-on vpn infoscyBerta
2018-02-28#8808 add a link to android's vpn settings for API >= 24cyBerta
2018-02-27Merge branch '8865_cancel_without_internet' into '0.9.8'cyberta
8865 - allow disconnect without internet See merge request leap/bitmask_android!50
2018-02-278865 - disconnect without internetFup Duck
* move function to dialog
2018-02-278865 - allow disconnect without connectionFup Duck
* revert last commit * dirty fix to disconnect - see #8876 * add padding in EipFragment
2018-02-27Revert "8865 - allow disconnecting without internet"Fup Duck
This reverts commit 44322f28b28676a8938f4c1066a75ba47397aa7d.
2018-02-268865 - allow disconnecting without internetFup Duck
* moved logic from MainActivity to EIP
2018-02-26Merge branch '#8754_reduce_battery_consumption' into '0.9.8'fupduck
#8754 reduce battery consumption See merge request leap/bitmask_android!54
2018-02-258865 - color background only a little if not internet connectionFup Duck
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-25#8754 don't cancel dialog onSavedInstanceStatecyBerta
2018-02-258865 - resolve discussionsFup Duck
2018-02-25Merge branch '0xacab_0.9.8' into 8865_cancel_without_internetFup Duck
2018-02-24#8754 ignore initial onCheckedChanged callback during ui setupcyBerta
2018-02-23#8754 disable dialog flag on cancelcyBerta
2018-02-23#8754 fix dialog cancellation handling and change dialog titlecyBerta
2018-02-23#8754 enable pause openvpn on device inactivity featurecyBerta
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 gateway selectioncyBerta
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 17:23:41 +0000