summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-02-01#8832 dear ci: say yes to googles licencescyBerta
2018-02-01Merge branch '#8818_tests_for_drawer' into #8832_update_ics-openvpncyBerta
2018-02-01#8832 and again... fix submodule urlcyBerta
2018-02-01#8832 fix submodule urlscyBerta
2018-02-01#8832 update resources and set to latest submodule commitscyBerta
2018-02-01fix build.gradle script - undo outcommenting ovpnlibs/assets foldercyBerta
2018-02-01#8832 update .gitignorecyBerta
2018-02-01#8832 add all ics-openvpn code changescyBerta
2018-02-01#8832 remove sym links between ics-openvpn and app modulecyBerta
2018-02-01#8832 update build.gradle disable old build-scriptcyBerta
2018-02-01#8832 make ics-openvpn a submodulecyBerta
2018-02-01#8832 update gradle wrapper and plugincyBerta
2018-02-01#8832 add missing resources for nowcyBerta
2018-01-30#8779 remove unused strings that even don't have a default translationcyBerta
2018-01-30#8818 add abi option to emulator setupcyBerta
2018-01-29#8818 fix emulator setup commandcyBerta
2018-01-29#8818 continuous integration for ui testscyBerta
2018-01-29#8818 update README.md after sdk updatecyBerta
2018-01-29#8818 keep legacy ui tests in seperate foler until tests are reimplementedcyBerta
2018-01-29#8818 test NavigationDrawer with espresso test and update sdk thereforecyBerta
2018-01-28Merge branch 'origin_0.9.8' into fupduck_8819_config_wizard_designcyBerta
2018-01-27Merge branch '8800_vpn_fragment' into '0.9.8'cyberta
new UI for EipFragment See merge request leap/bitmask_android!29
2018-01-27correct buildToolVersionFup Duck
2018-01-27fix comments for mergerequestFup Duck
2018-01-27resolve comments on merge requestFup Duck
2018-01-27fix first comments on merge requestFup Duck
2018-01-258819 - fix using anonymous loginFup Duck
2018-01-23check for correct providerFup Duck
2018-01-23new UI for EipFragmentFup Duck
2018-01-21handle startActivityForResultFup Duck
2018-01-21Merge remote-tracking branch '0xacab/0.9.8' into 8819_config_wizard_designFup Duck
2018-01-21Merge branch '8811_rename_vpn_to_provider_name' into '0.9.8'fupduck
8811 rename vpn to provider name See merge request leap/bitmask_android!26
2018-01-21make password verification visibleFup Duck
2018-01-19Merge branch '0.9.8' into '8811_rename_vpn_to_provider_name'fupduck
# Conflicts: # app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
2018-01-19Merge branch '#8822_add_leakCanary_to_project' into '0.9.8'fupduck
#8822 adds leakCanary library to Bitmask for analyzing memory leaks See merge request leap/bitmask_android!27
2018-01-19improve layoutFup Duck
* improve layout * gracefully handle orientation changes * respect small devices * set correct colors for buttons, error messages...
2018-01-19#8822 add no-op leak canary to Beta build typecyBerta
2018-01-19#8822 adds leakCanary library to Bitmask for analyzing memory leakscyBerta
2018-01-19#8799 fix confusing cancel dialogcyBerta
2018-01-18WizardConfiguration themeFup Duck
* download VPN certificate after loging in (#8813) * get the new design up to date (#8819) * fix crash when pressing login (#8817) * add a loading screen according to design (#8816)
2018-01-17#8811 unit test addedcyBerta
2018-01-17#8811 set vpn option to top of navigation drawer, minor ux improvementscyBerta
2018-01-17Merge branch 'fupduck_drawer' into mirror_0xacab_0.9.8cyBerta
2018-01-17reverted can → mustAllan Nordhøy
2018-01-17Spelling: Marked nouns, whitespace, upgrade, : BigversalAllan Nordhøy
2018-01-178788 fix image resolution for blocking icon in hdpicyBerta
2018-01-17#8788 implement VpnNotificationManager to handle notifications from VoidVPN ↵cyBerta
and OpenVPN
2018-01-17reverted can → mustAllan Nordhøy
2018-01-17Spelling: Marked nouns, whitespace, upgrade, : BigversalAllan Nordhøy
2018-01-17Merge branch '8788_two_notifications_on_android_kitkat' into '0.9.8'fupduck
8788 two notifications on android kitkat See merge request leap/bitmask_android!25