 Mieszko Wrzeszczyński
|
cb1e7bcdef
|
Convert multiple api calls to flatMap with rxJava
|
2019-01-04 21:05:23 +01:00 |
 Adam Domagalski
|
5db5d2f8e0
|
Merge branch 'showOnMap' of s416084/find-my-tutor-android into develop
|
2019-01-04 13:03:57 +00:00 |
|
Domagalski
|
ec29191342
|
tutor tap show on map and status indicator
|
2019-01-04 13:58:04 +01:00 |
|
Mieszko Wrzeszczyński
|
35ef25b2b7
|
Extend history
|
2019-01-04 11:11:55 +01:00 |
 marcin.jedynski
|
9e32a909d9
|
merge develop
|
2019-01-04 08:46:20 +01:00 |
|
marcin.jedynski
|
bc6e5179c7
|
minor adjustments
|
2019-01-04 03:48:16 +01:00 |
|
marcin.jedynski
|
8a88629b9a
|
managed hiding/disabling preferences depending on contents of response from api
|
2019-01-04 03:04:26 +01:00 |
|
Mieszko Wrzeszczyński
|
39d2d78ad8
|
Update gradle
|
2019-01-03 23:58:03 +01:00 |
|
Mieszko Wrzeszczyński
|
4fceb4195f
|
Fix blacklists
|
2019-01-03 23:41:24 +01:00 |
|
Mieszko Wrzeszczyński
|
7d1460353d
|
Merge branch 'develop' into add-slider
|
2019-01-03 23:02:18 +01:00 |
|
Mieszko Wrzeszczyński
|
f9226262ed
|
Fix UI whitelist
|
2019-01-03 23:01:55 +01:00 |
|
Domagalski
|
a0934638b3
|
toast and icon changed
|
2019-01-03 22:17:30 +01:00 |
|
Mieszko Wrzeszczyński
|
0147a83034
|
Merge branch 'develop' into add-slider
|
2019-01-03 21:57:56 +01:00 |
|
Mieszko Wrzeszczyński
|
81af3360f7
|
Add slider
|
2019-01-03 21:57:23 +01:00 |
|
Domagalski
|
2338e484f8
|
Merge confict
|
2019-01-03 21:53:15 +01:00 |
|
Domagalski
|
1eed752b1a
|
Merge branch 'develop' into blackNwhiteLists
|
2019-01-03 21:47:50 +01:00 |
|
Mieszko Wrzeszczyński
|
af1e1a53b4
|
Add proper search
|
2019-01-03 21:32:28 +01:00 |
|
Domagalski
|
3a6f20d12e
|
strings fixes and toast removed
|
2019-01-03 21:30:43 +01:00 |
|
Domagalski
|
d9ada9319b
|
white list finished, toogle on/off related to blacklsits
|
2019-01-03 21:07:32 +01:00 |
|
Mieszko Wrzeszczyński
|
8e94d86968
|
Fix corner case
|
2019-01-03 20:03:46 +01:00 |
|
Mieszko Wrzeszczyński
|
b81e28cd61
|
Fix online logic
|
2019-01-03 19:51:48 +01:00 |
|
Mieszko Wrzeszczyński
|
8bcecbbed5
|
Change online trigger
|
2019-01-03 19:50:11 +01:00 |
|
Mieszko Wrzeszczyński
|
ea0d6e1e96
|
Add save battery mode
|
2019-01-03 19:34:55 +01:00 |
|
Mieszko Wrzeszczyński
|
88f263217a
|
Use fused and change loc mode
|
2019-01-03 17:39:34 +01:00 |
|
marcin.jedynski
|
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 |
|
marcin.jedynski
|
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 |
|
Mieszko Wrzeszczyński
|
44e392c027
|
Add search on backend
|
2019-01-02 18:23:03 +01:00 |
|
Mieszko Wrzeszczyński
|
9059cbd01d
|
Fix online icon
|
2019-01-02 17:42:10 +01:00 |
|
Domagalski
|
aec9eaae19
|
string fixes
|
2019-01-02 12:21:05 +01:00 |
|
Domagalski
|
c8e68e3bb6
|
Merge branch 'develop' into blackNwhiteLists
|
2019-01-02 11:49:55 +01:00 |
|
Mieszko Wrzeszczyński
|
1a5c85c213
|
Adjust keyboard latout
|
2019-01-02 09:10:47 +01:00 |
|
Mieszko Wrzeszczyński
|
0bf3d147f0
|
Don't use GPS when manual sharing has been choosen
|
2019-01-02 09:03:44 +01:00 |
|
Mieszko Wrzeszczyński
|
4fd2795377
|
Add translation
|
2019-01-02 08:46:28 +01:00 |
|
Mieszko Wrzeszczyński
|
9dd2a62d43
|
Add checkbox online/offline users
|
2019-01-02 00:17:03 +01:00 |
|
Mieszko Wrzeszczyński
|
18547a3c52
|
Remove unnecessary code
|
2019-01-01 20:03:30 +01:00 |
|
Mieszko Wrzeszczyński
|
7f169e5b61
|
Choose only fused location
|
2018-12-31 17:25:06 +01:00 |
|
Domagalski
|
87642c5d7a
|
blacklist ready to test
|
2018-12-30 21:14:10 +01:00 |
|
Domagalski
|
84e6b95675
|
Black list ready to test
|
2018-12-30 21:13:23 +01:00 |
 Maciej Wanat
|
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 |
|
Mieszko Wrzeszczyński
|
69c42b323d
|
Add new build
|
2018-12-18 22:37:49 +01:00 |
|
Mieszko Wrzeszczyński
|
956cd83f9b
|
Destroy listeners after fetching loclization
|
2018-12-18 21:43:15 +01:00 |
|
Mieszko Wrzeszczyński
|
6334706165
|
Add release version
|
2018-12-18 20:01:54 +01:00 |
|
Mieszko Wrzeszczyński
|
ac3e8310d1
|
On presence mode only on WMI
|
2018-12-18 19:13:59 +01:00 |
|
Mieszko Wrzeszczyński
|
6030ec6d84
|
Merge branch 'fix-hints-content' of s416084/find-my-tutor-android into develop
|
2018-12-18 17:42:42 +00:00 |
|
Mieszko Wrzeszczyński
|
7ac5ac2d6f
|
Convert to develop
|
2018-12-18 18:31:57 +01:00 |
|
Mieszko Wrzeszczyński
|
bf6c8c3f51
|
Merge branch 'develop' into add-scrap-button
|
2018-12-18 00:03:43 +01:00 |
|
Mieszko Wrzeszczyński
|
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 |
|
Domagalski
|
8fdcdf4f80
|
almost working button, need to handle response
|
2018-12-17 16:20:58 +01:00 |
|
Domagalski
|
4d33a07a30
|
version code inc
|
2018-12-17 11:17:20 +01:00 |
|
Mieszko Wrzeszczyński
|
60c7283ba1
|
Fix colors
|
2018-12-17 10:54:22 +01:00 |
|
Mieszko Wrzeszczyński
|
ce14928bc6
|
fix duty hours
|
2018-12-17 10:41:09 +01:00 |
|
Mieszko Wrzeszczyński
|
4bdebcf52d
|
Add strings
|
2018-12-17 10:39:37 +01:00 |
|
Mieszko Wrzeszczyński
|
48ce4c76c8
|
Merge from develop
|
2018-12-17 10:34:25 +01:00 |
|
marcin.jedynski
|
5bf380b666
|
git history fix
|
2018-12-17 01:36:58 +01:00 |
|
Mieszko Wrzeszczyński
|
2d9c8aa6cc
|
Fix empty binding
|
2018-12-17 00:56:07 +01:00 |
|
marcin.jedynski
|
00ea68379b
|
rmved test hint
|
2018-12-17 00:51:11 +01:00 |
|
marcin.jedynski
|
3ddcccb176
|
minor adjustments
|
2018-12-17 00:48:35 +01:00 |
|
marcin.jedynski
|
c1bf626bbc
|
changed hint strings
|
2018-12-17 00:45:38 +01:00 |
|
Mieszko Wrzeszczyński
|
4fc348af56
|
Fix strings
|
2018-12-16 23:28:10 +01:00 |
|
Mieszko Wrzeszczyński
|
df1b380152
|
Change duty hours model
|
2018-12-16 22:46:44 +01:00 |
|
Mieszko Wrzeszczyński
|
9d82261be9
|
Fix duty hours
|
2018-12-16 22:45:44 +01:00 |
|
Domagalski
|
c1e20934e4
|
recycle view crash
|
2018-12-16 22:44:00 +01:00 |
|
Mieszko Wrzeszczyński
|
e7a2ecf86a
|
Add new infoboxes
|
2018-12-16 22:14:55 +01:00 |
|
marcin.jedynski
|
962a222fa8
|
minor cleanup
|
2018-12-16 18:19:58 +01:00 |
|
Mieszko Wrzeszczyński
|
9f0ef0590d
|
Fix strings
|
2018-12-16 17:42:05 +01:00 |
|
marcin.jedynski
|
7f16515074
|
translated strings, fixed validation filter
|
2018-12-16 17:37:18 +01:00 |
|
marcin.jedynski
|
80b0948033
|
working on duty hours validation
|
2018-12-16 16:56:54 +01:00 |
|
Mieszko Wrzeszczyński
|
e2a6bfd56c
|
Fix enabling BG
|
2018-12-16 16:19:32 +01:00 |
|
Mieszko Wrzeszczyński
|
f7edee0c56
|
Fix handle BG
|
2018-12-16 14:47:14 +01:00 |
|
Domagalski
|
dee33a2ec3
|
info icon at toolbar + clean up
|
2018-12-16 00:13:49 +01:00 |
|
Mieszko Wrzeszczyński
|
c8145323c5
|
refresh sharing tab
|
2018-12-15 23:45:02 +01:00 |
|
marcin.jedynski
|
f37fe44f2e
|
added strings and adjusted layout but needs fixing for smaller screens
|
2018-12-15 22:59:34 +01:00 |
|
Domagalski
|
672a6bee06
|
teraz
|
2018-12-15 22:47:23 +01:00 |
|
Mieszko Wrzeszczyński
|
41288f000b
|
Add modal to ask for BG
|
2018-12-15 21:49:08 +01:00 |
|
Domagalski
|
90aa21be1d
|
Info button on toolbar
|
2018-12-15 21:35:00 +01:00 |
|
marcin.jedynski
|
baa8cac0e4
|
working dutyhour adapter
|
2018-12-15 17:35:20 +01:00 |
|
Domagalski
|
3139d41ba4
|
strings fixed, base url server moved to Const class
|
2018-12-15 15:29:29 +01:00 |
|
Domagalski
|
7dd3e0cc00
|
Merge branch 'develop' into infoIcons
|
2018-12-15 14:48:05 +01:00 |
|
marcin.jedynski
|
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 |
|
marcin.jedynski
|
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 |
|
marcin.jedynski
|
2f4f3c13b6
|
work in progress
|
2018-12-12 03:27:04 +01:00 |
|
marcin.jedynski
|
355d800909
|
added fix for acre double strings
|
2018-12-12 00:09:01 +01:00 |
|
marcin.jedynski
|
f15e86cb21
|
Merge branch 'develop' into fixUXSharingTab
|
2018-12-11 21:33:24 +01:00 |
|
marcin.jedynski
|
afd3463bec
|
sharing tab stable version 1.1
|
2018-12-11 21:32:27 +01:00 |
|
Adam Domagalski
|
0c1bfb46c2
|
no opacity
|
2018-12-11 19:28:35 +01:00 |
|
Adam Domagalski
|
2332823ba8
|
removed duplicated acra
|
2018-12-11 19:24:45 +01:00 |
|
Domagalski
|
5f8e03986a
|
Merge branch 'develop' into infoIcons
|
2018-12-11 00:22:35 +01:00 |
|
Domagalski
|
e34642fd6e
|
info popups without on off switch
|
2018-12-11 00:04:01 +01:00 |
|
Mieszko Wrzeszczyński
|
041375b53f
|
Put version adjusted to master
|
2018-12-10 22:02:10 +01:00 |
|
Mieszko Wrzeszczyński
|
f757f36312
|
Clear list during fetch
|
2018-12-10 21:11:42 +01:00 |
|
Adam Domagalski
|
9aa9e8e0df
|
moving from mac
|
2018-12-10 19:52:32 +01:00 |
|
Domagalski
|
03c5a9a3ce
|
code clean up
|
2018-12-10 19:05:09 +01:00 |
|
Domagalski
|
b0927c174a
|
Merge branch 'infoIcons' of https://git.wmi.amu.edu.pl/s416084/find-my-tutor-android into infoIcons
|
2018-12-10 18:25:22 +01:00 |
|
Domagalski
|
a6d4ef55d2
|
map info icon
|
2018-12-10 18:21:01 +01:00 |
|
Adam Domagalski
|
3f725cd3b3
|
tranlation without map updated
|
2018-12-10 13:32:57 +01:00 |