 Mieszko Wrzeszczyński
|
dfc30c3790
|
Merge branch 'develop' into improve-rx-java-blacklists
|
2019-01-05 00:12:52 +01:00 |
|
Mieszko Wrzeszczyński
|
46cdaa8ef9
|
Add wrapper override
|
2019-01-05 00:12:33 +01:00 |
|
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
|
42f501f8e2
|
Merge branch 'extend-bg-history' of s416084/find-my-tutor-android into develop
|
2019-01-04 10:13:56 +00: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
|
87e0be8e79
|
Merge branch 'release-beta' of s416084/find-my-tutor-android into develop
|
2019-01-03 22:58:45 +00:00 |
|
Mieszko Wrzeszczyński
|
39d2d78ad8
|
Update gradle
|
2019-01-03 23:58:03 +01:00 |
|
Mieszko Wrzeszczyński
|
ed2ec41d8d
|
Merge branch 'fix-blacklists' of s416084/find-my-tutor-android into develop
|
2019-01-03 22:42:02 +00:00 |
|
Mieszko Wrzeszczyński
|
4fceb4195f
|
Fix blacklists
|
2019-01-03 23:41:24 +01:00 |
|
Mieszko Wrzeszczyński
|
8e610c52ca
|
Merge branch 'add-slider' of s416084/find-my-tutor-android into develop
|
2019-01-03 22:08:53 +00: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 |
|
Adam Domagalski
|
cff66ef70d
|
Merge branch 'blackNwhiteLists' of s416084/find-my-tutor-android into develop
|
2019-01-03 21:18:10 +00: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 |
|
Adam Domagalski
|
7d74d46d27
|
Merge branch 'blackNwhiteLists' of s416084/find-my-tutor-android into develop
|
2019-01-03 20:56:28 +00: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
|
6902a62d07
|
Merge branch 'user-search-query-approach' of s416084/find-my-tutor-android into develop
|
2019-01-03 20:33:46 +00: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
|
a908623064
|
Merge branch 'bg-fused-done' of s416084/find-my-tutor-android into develop
|
2019-01-03 19:04:20 +00:00 |
|
Mieszko Wrzeszczyński
|
8e94d86968
|
Fix corner case
|
2019-01-03 20:03:46 +01:00 |
|
Mieszko Wrzeszczyński
|
77d15a734e
|
Merge branch 'bg-fused-done' of s416084/find-my-tutor-android into develop
|
2019-01-03 18:52:14 +00:00 |
|
Mieszko Wrzeszczyński
|
b81e28cd61
|
Fix online logic
|
2019-01-03 19:51:48 +01:00 |
|
Mieszko Wrzeszczyński
|
4d921f7321
|
Merge branch 'bg-fused-done' of s416084/find-my-tutor-android into develop
|
2019-01-03 18:50:47 +00:00 |
|
Mieszko Wrzeszczyński
|
8bcecbbed5
|
Change online trigger
|
2019-01-03 19:50:11 +01:00 |
|
Mieszko Wrzeszczyński
|
88d016779f
|
Merge branch 'bg-fused-done' of s416084/find-my-tutor-android into develop
|
2019-01-03 18:40:06 +00: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 |
|
Mieszko Wrzeszczyński
|
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 |
|
Mieszko Wrzeszczyński
|
b366c0a17c
|
Merge branch 'search-user-backend' of s416084/find-my-tutor-android into develop
|
2019-01-02 17:24:05 +00:00 |
|
Mieszko Wrzeszczyński
|
44e392c027
|
Add search on backend
|
2019-01-02 18:23:03 +01:00 |
|
Mieszko Wrzeszczyński
|
be7a0cec0a
|
Merge branch 'fix-users-list-UI' of s416084/find-my-tutor-android into develop
|
2019-01-02 16:43:06 +00:00 |
|
Mieszko Wrzeszczyński
|
9059cbd01d
|
Fix online icon
|
2019-01-02 17:42:10 +01:00 |
|
Adam Domagalski
|
96e31166c6
|
Merge branch 'blackNwhiteLists' of s416084/find-my-tutor-android into develop
|
2019-01-02 11:22:10 +00:00 |
|
Domagalski
|
aec9eaae19
|
string fixes
|
2019-01-02 12:21:05 +01:00 |
|
Adam Domagalski
|
fce812f3ce
|
Merge branch 'blackNwhiteLists' of s416084/find-my-tutor-android into develop
|
2019-01-02 11:06:18 +00:00 |
|
Domagalski
|
c8e68e3bb6
|
Merge branch 'develop' into blackNwhiteLists
|
2019-01-02 11:49:55 +01:00 |
|
Mieszko Wrzeszczyński
|
150caf187d
|
Merge branch 'fix-keyboard-layout' of s416084/find-my-tutor-android into develop
|
2019-01-02 08:12:08 +00:00 |