summaryrefslogtreecommitdiff
path: root/app/src/main
AgeCommit message (Expand)Author
2018-05-12Merge branch 'cyberta_master' into #8885_testing_ProviderManagercyBerta
2018-05-12Merge branch 'master' into #8885_testing_ProviderManagercyBerta
2018-04-18Merge branch '#8876_eip_intent_service' into 'master'cyberta
2018-04-188876 - add missing breakFup Duck
2018-04-11prevent login to providers who allow anon usageFup Duck
2018-04-11Revert "8876 - move broadcastreceiver to onResume"Fup Duck
2018-03-238876 - move broadcastreceiver to onResumeFup Duck
2018-03-238876 - add bind job service permissionFup Duck
2018-03-23#8881 fix possible NPE in providerListBaseActivitycyBerta
2018-03-238876 - refactor EIP to JobIntentServiceFup Duck
2018-03-23Merge branch '#8876_eip_service' into 'master'fupduck
2018-03-23#8876 fix formattingcyBerta
2018-03-23#8876 refactoring in oder to move resultReceiver reference to runnablecyBerta
2018-03-22#8876 fix first part of review findings in EIP servicecyBerta
2018-03-21#8885 rename class variable namecyBerta
2018-03-18#8885 tests for ProviderManager and fixed behavior for deleted providerscyBerta
2018-03-18refactor ConfigHelper, split into multiple helper classescyBerta
2018-03-17#8878 fix back button behavior for about and log screencyBerta
2018-03-08#8876 make OpenvpnServiceConnection thread safecyBerta
2018-03-08#8876 introduce blocking OpenvpnServiceConnection for EIP and cancel connecti...cyBerta
2018-03-078876 - refactor EIP serviceFup Duck
2018-03-06Merge branch 'cleanup' into 'master'cyberta
2018-03-068876 - refactor EIP to serviceFup Duck
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-27set version name to 0.9.80.9.8cyBerta
2018-02-27Merge branch '8865_cancel_without_internet' into '0.9.8'cyberta
2018-02-278865 - smaller vertical paddingFup Duck
2018-02-27Merge branch '#8873_update_translations' into '0.9.8'fupduck
2018-02-27#8873 add new translationscyBerta
2018-02-278865 - disconnect without internetFup Duck
2018-02-27#8875 update licensescyBerta
2018-02-278865 - allow disconnect without connectionFup Duck
2018-02-27Revert "8865 - allow disconnecting without internet"Fup Duck
2018-02-27Merge branch '8871_reword_login_signup' into '0.9.8'cyberta
2018-02-27Merge branch '8872_new_launcher_icon' into '0.9.8'cyberta
2018-02-278872 - new launcher iconFup Duck
2018-02-278871 - rename sign up/log inFup Duck
2018-02-268865 - allow disconnecting without internetFup Duck
2018-02-26Merge branch '#8754_reduce_battery_consumption' into '0.9.8'fupduck
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
2018-02-25Merge branch '8851_remove_menu' into 0xacab_0.9.8Fup Duck
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