summaryrefslogtreecommitdiff
path: root/app/src/main
AgeCommit message (Expand)Author
2018-02-098827 - merge request discussionsFup Duck
2018-02-08Merge branch '8833_drawer_click' into '0.9.8'cyberta
2018-02-08Merge branch 'leap_0.9.8' into 8827_handle_switch_providerFup Duck
2018-02-08\#8554Fup Duck
2018-02-088833 - consume click in drawerFup Duck
2018-02-08Merge branch 'mirror_0xacab_0.9.8' into #8830_onBoot_alwaysOncyBerta
2018-02-08Merge branch 'leap_0.9.8' into 8827_handle_switch_providerFup Duck
2018-02-08Merge branch '8823_cw_tablet_layout' into '0.9.8'fupduck
2018-02-08Merge branch 'leap_0.9.8' into 8827_handle_switch_providerFup Duck
2018-02-088827 - add null checkFup Duck
2018-02-088827 - fix testsFup Duck
2018-02-08automatically start vpn after a successful configuration of a new providercyBerta
2018-02-08#8830 fix onBoot behavior after ui changescyBerta
2018-02-07#8841 fixes multidex issue on Android devices with API < 20cyBerta
2018-02-07fixes memory leak #8839cyBerta
2018-02-07#8829 fixes notification handling after ui changes and fixes also memory leak...cyBerta
2018-02-07#8823 update configuration wizard layout for tabletscyBerta
2018-02-07fix runtime exception due to missing resource for tabletscyBerta
2018-02-06Merge branch '8828_memory_leap_eip' into '0.9.8'cyberta
2018-02-06Merge branch 'leap_0.9.8' into 8828_memory_leap_eipFup Duck
2018-02-068827 - remove UserStatus referencesFup Duck
2018-02-068827 add EipCommandFup Duck
2018-02-068827 - handle switch provider correctlyFup Duck
2018-02-06Merge branch 'origin_0.9.8' into 8823_cw_tablet_layoutcyBerta
2018-02-06Merge branch 'origin_0.9.8' into fupduck_8826_custom_providercyBerta
2018-02-06fix build after reenabling copy classes from ics-openvpn build jobcyBerta
2018-02-06#8832 more upsteam changescyBerta
2018-02-058832 custom build script that builds first :ics-openvpn:main and afterwards :appcyBerta
2018-02-02#8832 add missing resource referencescyBerta
2018-02-01Merge branch '#8818_tests_for_drawer' into #8832_update_ics-openvpncyBerta
2018-02-01#8832 update resources and set to latest submodule commitscyBerta
2018-02-01#8832 add all ics-openvpn code changescyBerta
2018-02-01#8832 add missing resources for nowcyBerta
2018-01-308828 - fix EipFragment leakFup Duck
2018-01-30#8779 remove unused strings that even don't have a default translationcyBerta
2018-01-29#8818 test NavigationDrawer with espresso test and update sdk thereforecyBerta
2018-01-28Merge remote-tracking branch '0xacab/0.9.8' into 8826_custom_providerFup Duck
2018-01-28Merge branch 'origin_0.9.8' into fupduck_8819_config_wizard_designcyBerta
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-25add custom provider optionFup Duck
2018-01-23Merge branch '8819_config_wizard_design' into 8826_custom_providerFup Duck
2018-01-23check for correct providerFup Duck
2018-01-23add custom provider optionFup Duck
2018-01-23add tablet design for ConfigWizardFup 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