Commit Graph

524 Commits

Author SHA1 Message Date
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
2178b4d61d Merge branch 'minor-text-fixes' of s416084/find-my-tutor-android into develop 2018-12-19 18:53:55 +00:00
Maciej Wanat
552badf5a9 Minor text fixes 2018-12-19 19:51:14 +01:00
ee815260a4 Merge branch 'improve-BG-battery' of s416084/find-my-tutor-android into develop 2018-12-18 21:38:42 +00:00
69c42b323d Add new build 2018-12-18 22:37:49 +01:00
381f7b0033 Merge branch 'improve-BG-battery' of s416084/find-my-tutor-android into develop 2018-12-18 20:47:09 +00:00
956cd83f9b Destroy listeners after fetching loclization 2018-12-18 21:43:15 +01:00
8d7ba2e947 Merge branch 'develop' of s416084/find-my-tutor-android into master 2018-12-18 19:06:27 +00:00
fa0b69920f Merge branch 'fix-presence-mode' of s416084/find-my-tutor-android into develop 2018-12-18 19:04:51 +00:00
6334706165 Add release version 2018-12-18 20:01:54 +01:00
3eb8c922c9 Merge branch 'fix-presence-mode' of s416084/find-my-tutor-android into develop 2018-12-18 18:15:17 +00:00
ac3e8310d1 On presence mode only on WMI 2018-12-18 19:13:59 +01:00
6030ec6d84 Merge branch 'fix-hints-content' of s416084/find-my-tutor-android into develop 2018-12-18 17:42:42 +00:00
d80b83f2b5 Merge branch 'add-scrap-button' of s416084/find-my-tutor-android into develop 2018-12-18 17:41:49 +00:00
7ac5ac2d6f Convert to develop 2018-12-18 18:31:57 +01:00
bf6c8c3f51 Merge branch 'develop' into add-scrap-button 2018-12-18 00:03:43 +01:00
41c5dcebfd Add scrap button 2018-12-18 00:01:35 +01:00
Maciej Wanat
020ec1d41e Fix some of the messages content 2018-12-17 16:36:57 +01:00
8fdcdf4f80 almost working button, need to handle response 2018-12-17 16:20:58 +01:00
9255da3969 Merge branch 'develop' of s416084/find-my-tutor-android into master 2018-12-17 10:23:54 +00:00
303841c14e Merge branch 'betaRelease' of s416084/find-my-tutor-android into develop 2018-12-17 10:21:09 +00:00
4d33a07a30 version code inc 2018-12-17 11:17:20 +01:00
1eeaee7da1 Merge branch 'fix-colors' of s416084/find-my-tutor-android into develop 2018-12-17 09:55:10 +00:00
60c7283ba1 Fix colors 2018-12-17 10:54:22 +01:00
cae8a22c25 Merge branch 'fix-tutor-tab-develop' of s416084/find-my-tutor-android into develop 2018-12-17 09:44:03 +00:00
ce14928bc6 fix duty hours 2018-12-17 10:41:09 +01:00
4bdebcf52d Add strings 2018-12-17 10:39:37 +01:00
48ce4c76c8 Merge from develop 2018-12-17 10:34:25 +01:00
6b1537cd77 Merge branch 'tempBranch' of s416084/find-my-tutor-android into develop 2018-12-17 00:37:51 +00:00
5bf380b666 git history fix 2018-12-17 01:36:58 +01:00
2d9c8aa6cc Fix empty binding 2018-12-17 00:56:07 +01:00
00ea68379b rmved test hint 2018-12-17 00:51:11 +01:00
3ddcccb176 minor adjustments 2018-12-17 00:48:35 +01:00