summaryrefslogtreecommitdiff
path: root/app/src/main
AgeCommit message (Collapse)Author
2018-06-14Merge branch 'mirror_0xacab_master' into #8889_revise_NavigationDrawercyBerta
fix merge conflict in NavigationDrawerFragment
2018-06-11#8889 further changes after code reviewcyBerta
2018-06-07Minor updates according to received feedbackJanak Amarasena
2018-06-03Added donation remindersJanak Amarasena
2018-05-31Added donation button to navigation drawerJanak Amarasena
2018-05-24#8889 fix review findings and refactor code for better readabilitycyBerta
2018-05-12Merge branch 'master' into #8889_revise_NavigationDrawercyBerta
2018-05-12add missing copyright notecyBerta
2018-05-12#8889 change navigation drawer introduction behavior - hide navigation ↵cyBerta
drawer after 1,5 sec and show a little blue dot at the burger menu after 3 sec
2018-04-18Merge branch '#8876_eip_intent_service' into 'master'cyberta
8876 - refactor EIP to JobIntentService See merge request leap/bitmask_android!71
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
This reverts commit 0e77f2c
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
#8876 eip service See merge request leap/bitmask_android!66
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-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 ↵cyBerta
connections more rigid
2018-03-078876 - refactor EIP serviceFup Duck
* lazy loading for openVpnService * decrement processCounter if action is null
2018-03-06Merge branch 'cleanup' into 'master'cyberta
cleanup - rename layout files See merge request leap/bitmask_android!64
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
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-278865 - disconnect without internetFup Duck
* move function to dialog
2018-02-27#8875 update licensescyBerta
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-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 03:06:35 +0000