summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-02-06Merge branch '#8832_update_ics-openvpn' into '0.9.8'fupduck
#8832 update ics openvpn See merge request leap/bitmask_android!33
2018-02-06fix build after reenabling copy classes from ics-openvpn build jobcyBerta
2018-02-06#8832 more upsteam changescyBerta
2018-02-06#8832 add BuildConfig field opvnvpn3 (false) in order to use openvpn2.xcyBerta
2018-02-068832 code review fixescyBerta
2018-02-06#8832 update build instructions in Readme.mdcyBerta
2018-02-06update ndk to version r16bcyBerta
2018-02-06#8832 clean upcyBerta
2018-02-05ci instrumentation test issue will be fixed in another MRcyBerta
2018-02-05set submodule ics-openvpn to latest commit of bitmask branchcyBerta
2018-02-058832 custom build script that builds first :ics-openvpn:main and afterwards :appcyBerta
2018-02-05#8832 update gradle file: replace deprecated compile with new implementation ↵cyBerta
method
2018-02-02#8832 add gradle task for license issuecyBerta
2018-02-02#8832 accept google licenses also in ndk imagecyBerta
2018-02-02create always log on image creation to enable debuggingcyBerta
2018-02-02#8832 add missing resource referencescyBerta
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 23:07:56 +0000