summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-05Merge branch '#6117_disconnect_notification' into 'master'cyberta
#6117 - show cancel if no connection See merge request leap/bitmask_android!63
2018-03-056117 - show cancel if no connectionFup Duck
2018-03-05Merge branch '#8808_add_hint_to_enable_always-on' into 'master'fupduck
#8808 add hint to enable always on See merge request leap/bitmask_android!62
2018-03-02Resolve merge conflictscyBerta
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 'origin_0.9.8'0.9.8cyBerta
2018-02-27set version name to 0.9.80.9.8cyBerta
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 - smaller vertical paddingFup Duck
2018-02-27Merge branch '#8873_update_translations' into '0.9.8'fupduck
#8873 add new translations See merge request leap/bitmask_android!61
2018-02-27#8873 add new translationscyBerta
2018-02-27Merge branch '#8875_libraries_licences' into '0.9.8'fupduck
#8875 update licenses See merge request leap/bitmask_android!60
2018-02-27Merge branch '8863_update_provider_details' into '0.9.8'cyberta
8863 - update provider json See merge request leap/bitmask_android!59
2018-02-278865 - disconnect without internetFup Duck
* move function to dialog
2018-02-27#8875 update licensescyBerta
2018-02-278863 - update provider jsonFup Duck
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-27Merge branch '8871_reword_login_signup' into '0.9.8'cyberta
8871 - rename sign up/log in See merge request leap/bitmask_android!57
2018-02-27Merge branch '8872_new_launcher_icon' into '0.9.8'cyberta
8872 - new launcher icon See merge request leap/bitmask_android!58
2018-02-278872 - new launcher iconFup Duck
2018-02-278871 - rename sign up/log inFup Duck
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-25#8808 add dialog for always-on vpn infoscyBerta
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-25reset ics-openvpn commitFup 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#8808 add a link to android's vpn settings for API >= 24cyBerta
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-24Merge branch '8867_cedentials_add_url' into '0.9.8'cyberta
8867 - add url to username See merge request leap/bitmask_android!52
2018-02-24#8754 ignore initial onCheckedChanged callback during ui setupcyBerta
2018-02-23Merge branch 'master' into 'master'fupduck
Minor readme updates Closes #8870 See merge request leap/bitmask_android!55
2018-02-23Minor readme updateskwadronaut
change issue tracker/merge requests to point to 0xacab typo closes #8870
2018-02-23#8754 don't let both navigation drawer lists eat each other on small displayscyBerta
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