bitmask_android.git/app/src/main/java/se/leap/bitmaskclient, branch 0.9.8 [bitmask_android] Merge branch '8865_cancel_without_internet' into '0.9.8' 2018-02-27T19:12:52+00:00 cyberta cyberta@riseup.net 2018-02-27T19:12:52+00:00 6d42b38bed78133d200625d8e9242adc0a0f8a28 8865 - allow disconnect without internet See merge request leap/bitmask_android!50 
8865 - allow disconnect without internet

See merge request leap/bitmask_android!50
 8865 - disconnect without internet 2018-02-27T18:04:18+00:00 Fup Duck fupduck@sacknagel.com 2018-02-27T18:04:18+00:00 9787e857bca4dca056d9e55cc9c8eaa1756eb990 * move function to dialog 
* move function to dialog
8865 - allow disconnect without connection 2018-02-27T17:14:41+00:00 Fup Duck fupduck@sacknagel.com 2018-02-27T17:12:21+00:00 8a08d44facafd405e89e22b84dd82dfa3e85923c * revert last commit * dirty fix to disconnect - see #8876 * add padding in EipFragment 
* revert last commit
* dirty fix to disconnect - see #8876
* add padding in EipFragment
Revert "8865 - allow disconnecting without internet" 2018-02-27T16:57:32+00:00 Fup Duck fupduck@sacknagel.com 2018-02-27T16:57:32+00:00 e5c09ca83bafd5cc8d473793b18c82f649ba02f7 This reverts commit 44322f28b28676a8938f4c1066a75ba47397aa7d. 
This reverts commit 44322f28b28676a8938f4c1066a75ba47397aa7d.
8865 - allow disconnecting without internet 2018-02-26T19:36:58+00:00 Fup Duck fupduck@sacknagel.com 2018-02-26T19:31:48+00:00 44322f28b28676a8938f4c1066a75ba47397aa7d * moved logic from MainActivity to EIP 
* moved logic from MainActivity to EIP
Merge branch '#8754_reduce_battery_consumption' into '0.9.8' 2018-02-26T18:14:30+00:00 fupduck fupduck@riseup.net 2018-02-26T18:14:30+00:00 64dfeed947ed79abc8ff4208b9331689f525dac5 #8754 reduce battery consumption See merge request leap/bitmask_android!54 
#8754 reduce battery consumption

See merge request leap/bitmask_android!54
 8865 - color background only a little if not internet connection 2018-02-25T15:10:05+00:00 Fup Duck fupduck@sacknagel.com 2018-02-25T15:10:05+00:00 304efac028b1a2e2b145e5b2cba474c4b84fd3cf 






Merge branch '0xacab_0.9.8' into 8865_cancel_without_internet
2018-02-25T15:05:39+00:00

Fup Duck
fupduck@sacknagel.com

2018-02-25T15:05:39+00:00

0fac81767d2d48a5fe28c29e4ca6c4742fe62637












Merge branch '8868_ui_lollipop' into 0xacab_0.9.8
2018-02-25T14:52:11+00:00

Fup Duck
fupduck@sacknagel.com

2018-02-25T14:52:11+00:00

a643da6ff368c56186a92b135988d52d5f0bff63

* redo merge https://0xacab.org/leap/bitmask_android/merge_requests/53





* redo merge https://0xacab.org/leap/bitmask_android/merge_requests/53







Merge branch '8851_remove_menu' into 0xacab_0.9.8
2018-02-25T14:51:14+00:00

Fup Duck
fupduck@sacknagel.com

2018-02-25T14:51:14+00:00

03c1d39eccca1368fb160d6495f385846def5818

* redo merge https://0xacab.org/leap/bitmask_android/merge_requests/49





* redo merge https://0xacab.org/leap/bitmask_android/merge_requests/49