Commit Graph

456 Commits

Author SHA1 Message Date
42f501f8e2 Merge branch 'extend-bg-history' of s416084/find-my-tutor-android into develop 2019-01-04 10:13:56 +00:00
35ef25b2b7 Extend history 2019-01-04 11:11:55 +01:00
87e0be8e79 Merge branch 'release-beta' of s416084/find-my-tutor-android into develop 2019-01-03 22:58:45 +00:00
39d2d78ad8 Update gradle 2019-01-03 23:58:03 +01:00
ed2ec41d8d Merge branch 'fix-blacklists' of s416084/find-my-tutor-android into develop 2019-01-03 22:42:02 +00:00
4fceb4195f Fix blacklists 2019-01-03 23:41:24 +01:00
8e610c52ca Merge branch 'add-slider' of s416084/find-my-tutor-android into develop 2019-01-03 22:08:53 +00:00
7d1460353d Merge branch 'develop' into add-slider 2019-01-03 23:02:18 +01:00
f9226262ed Fix UI whitelist 2019-01-03 23:01:55 +01:00
cff66ef70d Merge branch 'blackNwhiteLists' of s416084/find-my-tutor-android into develop 2019-01-03 21:18:10 +00:00
a0934638b3 toast and icon changed 2019-01-03 22:17:30 +01:00
0147a83034 Merge branch 'develop' into add-slider 2019-01-03 21:57:56 +01:00
81af3360f7 Add slider 2019-01-03 21:57:23 +01:00
7d74d46d27 Merge branch 'blackNwhiteLists' of s416084/find-my-tutor-android into develop 2019-01-03 20:56:28 +00:00
2338e484f8 Merge confict 2019-01-03 21:53:15 +01:00
1eed752b1a Merge branch 'develop' into blackNwhiteLists 2019-01-03 21:47:50 +01:00
6902a62d07 Merge branch 'user-search-query-approach' of s416084/find-my-tutor-android into develop 2019-01-03 20:33:46 +00:00
af1e1a53b4 Add proper search 2019-01-03 21:32:28 +01:00
3a6f20d12e strings fixes and toast removed 2019-01-03 21:30:43 +01:00
d9ada9319b white list finished, toogle on/off related to blacklsits 2019-01-03 21:07:32 +01:00
a908623064 Merge branch 'bg-fused-done' of s416084/find-my-tutor-android into develop 2019-01-03 19:04:20 +00:00
8e94d86968 Fix corner case 2019-01-03 20:03:46 +01:00
77d15a734e Merge branch 'bg-fused-done' of s416084/find-my-tutor-android into develop 2019-01-03 18:52:14 +00:00
b81e28cd61 Fix online logic 2019-01-03 19:51:48 +01:00
4d921f7321 Merge branch 'bg-fused-done' of s416084/find-my-tutor-android into develop 2019-01-03 18:50:47 +00:00
8bcecbbed5 Change online trigger 2019-01-03 19:50:11 +01:00
88d016779f Merge branch 'bg-fused-done' of s416084/find-my-tutor-android into develop 2019-01-03 18:40:06 +00:00
ea0d6e1e96 Add save battery mode 2019-01-03 19:34:55 +01:00
88f263217a Use fused and change loc mode 2019-01-03 17:39:34 +01:00
6bdf402df8 Merge branch 'text-fixes' of s416084/find-my-tutor-android into develop 2019-01-02 22:29:57 +00:00
Maciej Wanat
b323939067 Text fixes 2019-01-02 19:16:04 +01:00
b366c0a17c Merge branch 'search-user-backend' of s416084/find-my-tutor-android into develop 2019-01-02 17:24:05 +00:00
44e392c027 Add search on backend 2019-01-02 18:23:03 +01:00
be7a0cec0a Merge branch 'fix-users-list-UI' of s416084/find-my-tutor-android into develop 2019-01-02 16:43:06 +00:00
9059cbd01d Fix online icon 2019-01-02 17:42:10 +01:00
96e31166c6 Merge branch 'blackNwhiteLists' of s416084/find-my-tutor-android into develop 2019-01-02 11:22:10 +00:00
aec9eaae19 string fixes 2019-01-02 12:21:05 +01:00
fce812f3ce Merge branch 'blackNwhiteLists' of s416084/find-my-tutor-android into develop 2019-01-02 11:06:18 +00:00
c8e68e3bb6 Merge branch 'develop' into blackNwhiteLists 2019-01-02 11:49:55 +01:00
150caf187d Merge branch 'fix-keyboard-layout' of s416084/find-my-tutor-android into develop 2019-01-02 08:12:08 +00:00
1a5c85c213 Adjust keyboard latout 2019-01-02 09:10:47 +01:00
0bf3d147f0 Don't use GPS when manual sharing has been choosen 2019-01-02 09:03:44 +01:00
540536a4a8 Merge branch 'online-offline-list' of s416084/find-my-tutor-android into develop 2019-01-02 07:47:45 +00:00
4fd2795377 Add translation 2019-01-02 08:46:28 +01:00
9dd2a62d43 Add checkbox online/offline users 2019-01-02 00:17:03 +01:00
598e603dfb Merge branch 'fix-bg-power-saving' of s416084/find-my-tutor-android into develop 2019-01-01 19:07:27 +00:00
18547a3c52 Remove unnecessary code 2019-01-01 20:03:30 +01:00
7f169e5b61 Choose only fused location 2018-12-31 17:25:06 +01:00
87642c5d7a blacklist ready to test 2018-12-30 21:14:10 +01:00
84e6b95675 Black list ready to test 2018-12-30 21:13:23 +01:00