summaryrefslogtreecommitdiff
path: root/app/src/main/res
AgeCommit message (Collapse)Author
2018-02-19fix invalid vpn user messagecyBerta
2018-02-19add current translationscyBerta
2018-02-18Merge branch 'mirror_0xacab_0.9.8' into #8797_certificate_expirationcyBerta
* fix merge conflicts in: app/src/main/java/se/leap/bitmaskclient/EipFragment.java app/src/main/java/se/leap/bitmaskclient/eip/EIP.java app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java
2018-02-16Merge branch '#8831_progress_animation_when_connecting' into '0.9.8'cyberta
#8831 progress animation when connecting See merge request leap/bitmask_android!43
2018-02-16Merge branch 'leap_0.9.8' into #8797_certificate_expirationFup Duck
2018-02-158797 - pair programming effortFup Duck
2018-02-14#8846 remove legacy code and files: Dashboard, LogWindow, ↵cyBerta
UserStatusFragment, FabButton library etc.
2018-02-13#8831 smoothing progressbar a little bitcyBerta
2018-02-13#8831 add a progress animation to EipFragment and don't start blocking vpn ↵cyBerta
when user triggered vpn start from UI
2018-02-10Merge branch '8554_error_array' into '0.9.8'cyberta
#8554 See merge request leap/bitmask_android!41
2018-02-098554 - show Loading screen on bigger screensFup Duck
2018-02-08\#8554Fup Duck
* show only first error of error array * show loading screenin credentials activities * render link in error message correctly
2018-02-088833 - consume click in drawerFup Duck
2018-02-08Merge branch '8823_cw_tablet_layout' into '0.9.8'fupduck
8823 cw tablet layout See merge request leap/bitmask_android!36
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 'origin_0.9.8' into 8823_cw_tablet_layoutcyBerta
2018-02-06Merge branch 'origin_0.9.8' into fupduck_8826_custom_providercyBerta
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-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-23add custom provider optionFup Duck
2018-01-23add tablet design for ConfigWizardFup Duck
based upon !28 I could not check this - starting emulator freezes my system and I have no tablet.
2018-01-23new UI for EipFragmentFup Duck
2018-01-21Merge remote-tracking branch '0xacab/0.9.8' into 8819_config_wizard_designFup Duck
2018-01-19improve layoutFup Duck
* improve layout * gracefully handle orientation changes * respect small devices * set correct colors for buttons, error messages...
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-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-13add padding to f_logFup Duck
2018-01-11Merge remote-tracking branch '0xacab/0.9.8' into 8802_drawerFup Duck
2018-01-108773 more test cases and clean-upcyBerta
2018-01-09create LoginActivity and SignUpActivityFup Duck
2018-01-09create ProviderDetail ActivityFup Duck
2018-01-08AboutActivity to AboutFragmentFup Duck
2018-01-08seperate accountList and settingsList in drawerFup Duck
2018-01-038773 preseeded providers implementation for production flavorcyBerta
2017-12-19adjust FragmentsFup Duck
2017-12-19move log fragment layoutFup Duck
2017-12-14Merge remote-tracking branch '0xacab/0.9.8' into 0.9.8/sidebarFup Duck
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 07:26:30 +0000