|
|
e2f15ea772
|
Merge branch 'bottomNavFix' of s416084/find-my-tutor-android into develop
|
2019-01-06 14:39:21 +00:00 |
|
|
|
fac7ae0fdf
|
bottom nav focus fixed
|
2019-01-06 15:36:49 +01:00 |
|
|
|
e9f71d5790
|
Merge branch 'fix-pref-sharing' of s416084/find-my-tutor-android into develop
|
2019-01-06 10:59:25 +00:00 |
|
|
|
3b4bb9cbae
|
Fix sharing buttons
|
2019-01-06 11:58:22 +01:00 |
|
|
|
72eea53a8c
|
Merge branch 'fix-bugs-related-to-network' of s416084/find-my-tutor-android into develop
|
2019-01-05 19:39:01 +00:00 |
|
|
|
9a96f474d9
|
Increase build version
|
2019-01-05 20:28:43 +01:00 |
|
|
|
5c5b9c745e
|
Merge branch 'develop' into fix-bugs-related-to-network
|
2019-01-05 20:27:46 +01:00 |
|
|
|
e4b0bb1f3d
|
Fix networks issues
|
2019-01-05 20:22:34 +01:00 |
|
|
|
331e7b5fe3
|
Merge branch 'fix-bugs-related-to-network' of s416084/find-my-tutor-android into develop
|
2019-01-05 14:54:57 +00:00 |
|
|
|
9525d47600
|
Fix
|
2019-01-05 15:52:56 +01:00 |
|
|
|
1f5ac834e5
|
Merge branch 'fix-imports' of s416084/find-my-tutor-android into develop
|
2019-01-05 07:24:10 +00: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 |
|
|
|
3f0ccda50b
|
Merge branch 'improve-rx-java-blacklists' of s416084/find-my-tutor-android into develop
|
2019-01-04 23:36:48 +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 |
|
|
|
42f501f8e2
|
Merge branch 'extend-bg-history' of s416084/find-my-tutor-android into develop
|
2019-01-04 10:13:56 +00: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 |
|
|
|
87e0be8e79
|
Merge branch 'release-beta' of s416084/find-my-tutor-android into develop
|
2019-01-03 22:58:45 +00:00 |
|
|
|
39d2d78ad8
|
Update gradle
|
2019-01-03 23:58:03 +01:00 |
|
|
|
ed2ec41d8d
|
Merge branch 'fix-blacklists' of s416084/find-my-tutor-android into develop
|
2019-01-03 22:42:02 +00:00 |
|
|
|
4fceb4195f
|
Fix blacklists
|
2019-01-03 23:41:24 +01:00 |
|
|
|
8e610c52ca
|
Merge branch 'add-slider' of s416084/find-my-tutor-android into develop
|
2019-01-03 22:08:53 +00: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 |
|
|
|
cff66ef70d
|
Merge branch 'blackNwhiteLists' of s416084/find-my-tutor-android into develop
|
2019-01-03 21:18:10 +00: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 |
|
|
|
7d74d46d27
|
Merge branch 'blackNwhiteLists' of s416084/find-my-tutor-android into develop
|
2019-01-03 20:56:28 +00: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 |
|
|
|
6902a62d07
|
Merge branch 'user-search-query-approach' of s416084/find-my-tutor-android into develop
|
2019-01-03 20:33:46 +00: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 |
|
|
|
a908623064
|
Merge branch 'bg-fused-done' of s416084/find-my-tutor-android into develop
|
2019-01-03 19:04:20 +00:00 |
|
|
|
8e94d86968
|
Fix corner case
|
2019-01-03 20:03:46 +01:00 |
|
|
|
77d15a734e
|
Merge branch 'bg-fused-done' of s416084/find-my-tutor-android into develop
|
2019-01-03 18:52:14 +00:00 |
|
|
|
b81e28cd61
|
Fix online logic
|
2019-01-03 19:51:48 +01:00 |
|
|
|
4d921f7321
|
Merge branch 'bg-fused-done' of s416084/find-my-tutor-android into develop
|
2019-01-03 18:50:47 +00:00 |
|
|
|
8bcecbbed5
|
Change online trigger
|
2019-01-03 19:50:11 +01:00 |
|
|
|
88d016779f
|
Merge branch 'bg-fused-done' of s416084/find-my-tutor-android into develop
|
2019-01-03 18:40:06 +00:00 |
|
