summaryrefslogtreecommitdiff
path: root/app/src/main/res
AgeCommit message (Collapse)Author
2018-02-28#8808 add a link to android's vpn settings for API >= 24cyBerta
2018-02-27Merge branch '8865_cancel_without_internet' into '0.9.8'cyberta
8865 - allow disconnect without internet See merge request leap/bitmask_android!50
2018-02-278865 - smaller vertical paddingFup Duck
2018-02-27Merge branch '#8873_update_translations' into '0.9.8'fupduck
#8873 add new translations See merge request leap/bitmask_android!61
2018-02-27#8873 add new translationscyBerta
2018-02-27#8875 update licensescyBerta
2018-02-278865 - allow disconnect without connectionFup Duck
* revert last commit * dirty fix to disconnect - see #8876 * add padding in EipFragment
2018-02-27Revert "8865 - allow disconnecting without internet"Fup Duck
This reverts commit 44322f28b28676a8938f4c1066a75ba47397aa7d.
2018-02-27Merge branch '8871_reword_login_signup' into '0.9.8'cyberta
8871 - rename sign up/log in See merge request leap/bitmask_android!57
2018-02-27Merge branch '8872_new_launcher_icon' into '0.9.8'cyberta
8872 - new launcher icon See merge request leap/bitmask_android!58
2018-02-278872 - new launcher iconFup Duck
2018-02-278871 - rename sign up/log inFup Duck
2018-02-268865 - allow disconnecting without internetFup Duck
* moved logic from MainActivity to EIP
2018-02-26Merge branch '#8754_reduce_battery_consumption' into '0.9.8'fupduck
#8754 reduce battery consumption See merge request leap/bitmask_android!54
2018-02-25Merge branch '0xacab_0.9.8' into 8865_cancel_without_internetFup Duck
2018-02-25Merge branch '8868_ui_lollipop' into 0xacab_0.9.8Fup Duck
* redo merge https://0xacab.org/leap/bitmask_android/merge_requests/53
2018-02-258865 - resolve discussionsFup Duck
2018-02-23#8754 don't let both navigation drawer lists eat each other on small displayscyBerta
2018-02-23#8754 fix dialog cancellation handling and change dialog titlecyBerta
2018-02-23#8754 enable pause openvpn on device inactivity featurecyBerta
2018-02-228868 - fix lollipop ui issuesFup Duck
2018-02-228851 - remove options menuFup Duck
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 07:57:01 +0000