summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
AgeCommit message (Expand)Author
2018-02-18Merge branch 'mirror_0xacab_0.9.8' into #8797_certificate_expirationcyBerta
2018-02-18handle intent action in MainActivitys onCreatecyBerta
2018-02-17#8797 fix recreation / restore of MainActivityErrorDialogscyBerta
2018-02-16#8857 fix dialog recreation in EipFragmentcyBerta
2018-02-16Merge branch '#8831_progress_animation_when_connecting' into '0.9.8'cyberta
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, UserStatusFragment,...cyBerta
2018-02-13Merge branch 'origin_0.9.8' into #8831_progress_animation_when_connectingcyBerta
2018-02-098827 - resolve discussionsFup Duck
2018-02-08Merge branch 'leap_0.9.8' into 8827_handle_switch_providerFup Duck
2018-02-07#8829 fixes notification handling after ui changes and fixes also memory leak...cyBerta
2018-02-068827 - handle switch provider correctlyFup Duck
2018-01-28Merge branch 'origin_0.9.8' into fupduck_8819_config_wizard_designcyBerta
2018-01-27fix first comments on merge requestFup Duck
2018-01-23new UI for EipFragmentFup Duck
2018-01-21handle startActivityForResultFup Duck
2018-01-17#8811 set vpn option to top of navigation drawer, minor ux improvementscyBerta
2018-01-13clean up MainActivityFup Duck
2018-01-13static constant importsFup Duck
2018-01-08seperate accountList and settingsList in drawerFup Duck
2017-12-19adjust FragmentsFup Duck
2017-12-14add missing filesFup Duck
2017-12-14add LogFragmentFup Duck
2017-12-07base for sidebarFup Duck