Commit Graph

417 Commits

Author SHA1 Message Date
66fa45baa0 Fix BG handle 2019-01-06 22:47:03 +01:00
51dcefcc62 Merge branch 'develop' into newProfile 2019-01-06 20:56:57 +01:00
489901dca1 added timepicker, email validation, new UI 2019-01-06 20:56:01 +01:00
8ab7e526e6 Merge branch 'fix-pref-sharing' of s416084/find-my-tutor-android into develop 2019-01-06 17:58:56 +00:00
bca6885591 Fix right button preferences 2019-01-06 18:52:14 +01:00
fac7ae0fdf bottom nav focus fixed 2019-01-06 15:36:49 +01:00
3b4bb9cbae Fix sharing buttons 2019-01-06 11:58:22 +01:00
9a96f474d9 Increase build version 2019-01-05 20:28:43 +01:00
e4b0bb1f3d Fix networks issues 2019-01-05 20:22:34 +01:00
9525d47600 Fix 2019-01-05 15:52:56 +01:00
25e8d42ee0 Fix imports 2019-01-05 08:22:48 +01:00
eb4147557b Merge branch 'addRemovingManuals' of s416084/find-my-tutor-android into develop 2019-01-04 23:45:41 +00:00
da018120f1 Update gradle 2019-01-05 00:35:52 +01:00
dfc30c3790 Merge branch 'develop' into improve-rx-java-blacklists 2019-01-05 00:12:52 +01:00
46cdaa8ef9 Add wrapper override 2019-01-05 00:12:33 +01:00
cb1e7bcdef Convert multiple api calls to flatMap with rxJava 2019-01-04 21:05:23 +01:00
5db5d2f8e0 Merge branch 'showOnMap' of s416084/find-my-tutor-android into develop 2019-01-04 13:03:57 +00:00
ec29191342 tutor tap show on map and status indicator 2019-01-04 13:58:04 +01:00
35ef25b2b7 Extend history 2019-01-04 11:11:55 +01:00
9e32a909d9 merge develop 2019-01-04 08:46:20 +01:00
bc6e5179c7 minor adjustments 2019-01-04 03:48:16 +01:00
8a88629b9a managed hiding/disabling preferences depending on contents of response from api 2019-01-04 03:04:26 +01:00
39d2d78ad8 Update gradle 2019-01-03 23:58:03 +01:00
4fceb4195f Fix blacklists 2019-01-03 23:41:24 +01: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
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
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
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
8e94d86968 Fix corner case 2019-01-03 20:03:46 +01:00
b81e28cd61 Fix online logic 2019-01-03 19:51:48 +01:00
8bcecbbed5 Change online trigger 2019-01-03 19:50:11 +01: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
a4fd031a36 resolved case when selected entries are deleted, working towards enabling/disabling views when there are no items 2019-01-03 10:38:58 +01:00
94368b05d1 deleting works, needs some polishing like refreshing summaries and hiding buttons depending on the level of sharing 2019-01-03 02:12:17 +01:00
Maciej Wanat
b323939067 Text fixes 2019-01-02 19:16:04 +01:00
44e392c027 Add search on backend 2019-01-02 18:23:03 +01:00
9059cbd01d Fix online icon 2019-01-02 17:42:10 +01:00
aec9eaae19 string fixes 2019-01-02 12:21:05 +01:00
c8e68e3bb6 Merge branch 'develop' into blackNwhiteLists 2019-01-02 11:49:55 +01: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
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
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
69c42b323d Add new build 2018-12-18 22:37:49 +01:00
956cd83f9b Destroy listeners after fetching loclization 2018-12-18 21:43:15 +01:00
6334706165 Add release version 2018-12-18 20:01:54 +01: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
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
4d33a07a30 version code inc 2018-12-17 11:17:20 +01:00
60c7283ba1 Fix colors 2018-12-17 10:54:22 +01: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
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
c1bf626bbc changed hint strings 2018-12-17 00:45:38 +01:00
4fc348af56 Fix strings 2018-12-16 23:28:10 +01:00
df1b380152 Change duty hours model 2018-12-16 22:46:44 +01:00
9d82261be9 Fix duty hours 2018-12-16 22:45:44 +01:00
c1e20934e4 recycle view crash 2018-12-16 22:44:00 +01:00
e7a2ecf86a Add new infoboxes 2018-12-16 22:14:55 +01:00
962a222fa8 minor cleanup 2018-12-16 18:19:58 +01:00
9f0ef0590d Fix strings 2018-12-16 17:42:05 +01:00
7f16515074 translated strings, fixed validation filter 2018-12-16 17:37:18 +01:00
80b0948033 working on duty hours validation 2018-12-16 16:56:54 +01:00
e2a6bfd56c Fix enabling BG 2018-12-16 16:19:32 +01:00
f7edee0c56 Fix handle BG 2018-12-16 14:47:14 +01:00
dee33a2ec3 info icon at toolbar + clean up 2018-12-16 00:13:49 +01:00
c8145323c5 refresh sharing tab 2018-12-15 23:45:02 +01:00
f37fe44f2e added strings and adjusted layout but needs fixing for smaller screens 2018-12-15 22:59:34 +01:00
672a6bee06 teraz 2018-12-15 22:47:23 +01:00
41288f000b Add modal to ask for BG 2018-12-15 21:49:08 +01:00
90aa21be1d Info button on toolbar 2018-12-15 21:35:00 +01:00
baa8cac0e4 working dutyhour adapter 2018-12-15 17:35:20 +01:00
3139d41ba4 strings fixed, base url server moved to Const class 2018-12-15 15:29:29 +01:00
7dd3e0cc00 Merge branch 'develop' into infoIcons 2018-12-15 14:48:05 +01:00
0884fc4873 Merge branch 'extendTutorTab' of git.wmi.amu.edu.pl:s416084/find-my-tutor-android into extendTutorTab 2018-12-15 00:33:41 +01:00
e775961ed2 created duty hour adapter 2018-12-15 00:33:09 +01:00
Marcin Jedynski
a3a847fdeb moved duty hours to the center of the screen 2018-12-13 10:33:02 +01:00
Adam Domagalski
f568cea711 popups text color half black 2018-12-12 11:23:45 +01:00