Commit Graph

565 Commits

Author SHA1 Message Date
b7e1e4a984 Fix 5.1 2019-01-13 16:06:58 +01:00
5a96d93d37 Merge branch 'fix-info-battery-prompt' of s416084/find-my-tutor-android into develop 2019-01-13 13:38:16 +00:00
33cfa90a28 Update gradle 2019-01-13 14:37:15 +01:00
6fa458d198 show prompt only for tutors 2019-01-13 14:36:51 +01:00
eb30100183 Merge branch 'presence-wifi-approach' of s416084/find-my-tutor-android into develop 2019-01-13 13:11:38 +00:00
e1c266263a Fix low battery mode 2019-01-13 14:10:50 +01:00
d88525a764 Add presence which works with Wifi 2019-01-13 13:44:10 +01:00
430914bab1 Merge branch 'fix-acra' of s416084/find-my-tutor-android into develop 2019-01-13 10:34:55 +00:00
786a73c963 Fix acra 2019-01-13 11:31:36 +01:00
1f2867cb43 Merge branch 'develop' into fix-acra 2019-01-13 02:09:31 +01:00
5770217c45 Merge branch 'fix-battery-prompt' of s416084/find-my-tutor-android into develop 2019-01-12 20:16:40 +00:00
17b7f4c9a2 fix 2019-01-12 21:15:37 +01:00
f46d9cc60e Merge branch 'add-beta-student-security' of s416084/find-my-tutor-android into develop 2019-01-12 19:23:39 +00:00
325f8a99a2 master version 2019-01-12 20:23:03 +01:00
0ec0e95798 Add logout security 2019-01-12 20:22:30 +01:00
085dc1e4d6 Merge branch 'fix-login-form' of s416084/find-my-tutor-android into develop 2019-01-12 18:37:55 +00:00
9f78eaf688 Fix login form 2019-01-12 19:37:25 +01:00
b528ec68bb Merge branch 'batteryExclusion' of s416084/find-my-tutor-android into develop 2019-01-12 18:27:16 +00:00
7b79a5339a merge develop 2019-01-12 19:26:49 +01:00
6e98eeff16 Merge branch 'fix-last-seen' of s416084/find-my-tutor-android into develop 2019-01-12 18:24:01 +00:00
5fccb72843 fix statuses 2019-01-12 19:15:40 +01:00
377ee3bcbc Change to one get 2019-01-12 18:46:52 +01:00
282f74f5e0 Remove shadow from buttons 2019-01-12 16:42:51 +01:00
b126cbfe31 Fix tutors list 2019-01-12 16:38:28 +01:00
fae7a5f0fe pop up with battery exc + transaltions 2019-01-12 14:56:54 +01:00
e64f5d380c Commit to check out on production 2019-01-11 00:34:27 +01:00
2f25f06d18 On Attach fix 2019-01-11 00:34:04 +01:00
a27c18b468 Merge branch 'fix-acra' of s416084/find-my-tutor-android into develop 2019-01-10 23:26:18 +00:00
311cd7868b Fix acra 2019-01-11 00:25:43 +01:00
be58fba3ad Merge branch 'fix-back-button' of s416084/find-my-tutor-android into develop 2019-01-10 23:00:32 +00:00
2f93dc5d54 Update gradle 2019-01-10 23:59:35 +01:00
c8cdc3aac0 fix return button 2019-01-10 23:58:33 +01:00
f872b08acc Merge branch 'users-list-last-seen' of s416084/find-my-tutor-android into develop 2019-01-10 22:41:47 +00:00
97bb141a81 Update gradle 2019-01-10 23:40:40 +01:00
a98b188978 Merge branch 'develop' into users-list-last-seen 2019-01-10 23:39:02 +01:00
20f585509c Fix tutor tab fixes 2019-01-10 23:36:44 +01:00
ad83c5ed88 Change loaders 2019-01-10 23:32:45 +01:00
623957bcb2 Fix tutor tab 2019-01-10 21:31:31 +01:00
ec68ae14ef Fix resources 2019-01-10 00:51:14 +01:00
393f25b1f9 Merge branch 'userListEnchancment' of s416084/find-my-tutor-android into develop 2019-01-09 23:41:41 +00:00
3379faf59b Update gradle version 2019-01-10 00:40:00 +01:00
1f888ad1f2 Merge branch 'develop' into userListEnchancment 2019-01-10 00:39:29 +01:00
ebe2266036 Merge branch 'fix-offline-box' of s416084/find-my-tutor-android into develop 2019-01-09 23:35:24 +00:00
f36a811d03 Merge branch 'develop' into fix-offline-box 2019-01-10 00:33:38 +01:00
ffff380560 Fix gps box 2019-01-10 00:33:10 +01:00
6d73598d5e code clean up and string translations for last seen 2019-01-10 00:11:37 +01:00
f98e4289fb last seen working just fine 2019-01-09 23:44:05 +01:00
d583c807d5 Merge branch 'add-toggle-password-login' of s416084/find-my-tutor-android into develop 2019-01-09 21:52:01 +00:00
86b6a1a86f Add toggle password 2019-01-09 22:50:51 +01:00
4300c33d65 show on map modal fix, Status added 2019-01-09 21:20:48 +01:00