 Mieszko Wrzeszczyński
|
1803ac13b6
|
Merge branch 'fix-user-list' of s416084/find-my-tutor-android into develop
|
2018-12-10 20:14:13 +00:00 |
|
Mieszko Wrzeszczyński
|
f757f36312
|
Clear list during fetch
|
2018-12-10 21:11:42 +01:00 |
|
Mieszko Wrzeszczyński
|
ba73d08cd4
|
Merge branch 'develop' of ssh://git.wmi.amu.edu.pl/s416084/find-my-tutor-android into develop
|
2018-12-10 20:52:25 +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 |
|
Mieszko Wrzeszczyński
|
023926e36c
|
Merge branch 'one-cord-per-user' of s416084/find-my-tutor-android into develop
|
2018-12-10 09:49:55 +00:00 |
|
Mieszko Wrzeszczyński
|
844d636d6e
|
Merge branch 'develop' of ssh://git.wmi.amu.edu.pl/s416084/find-my-tutor-android into develop
|
2018-12-10 09:45:30 +01:00 |
 Marcin Jedyński
|
f4a0c71a18
|
Merge branch 'fixUXSharingTab' of s416084/find-my-tutor-android into develop
|
2018-12-10 00:53:24 +00:00 |
|
marcin.jedynski
|
930876a2f5
|
sharing tab stable release
|
2018-12-10 01:16:18 +01:00 |
|
Mieszko Wrzeszczyński
|
4c2f706422
|
Add put for cord
|
2018-12-10 00:00:04 +01:00 |
|
marcin.jedynski
|
764518d49c
|
:Merge branch 'develop' into fixUXSharingTab
|
2018-12-09 23:47:33 +01:00 |
|
marcin.jedynski
|
5ffdf75b66
|
polished sharing tab
|
2018-12-09 23:45:16 +01:00 |
|
Mieszko Wrzeszczyński
|
385df14b2f
|
Merge
|
2018-12-09 18:54:18 +01:00 |
|
Domagalski
|
fc428451a9
|
map info pop up
|
2018-12-08 13:20:03 +01:00 |
|
Marcin Jedyński
|
5fe12a3f4b
|
Merge branch 'fixUXSharingTab' of s416084/find-my-tutor-android into develop
|
2018-12-08 09:57:43 +00:00 |
|
Marcin Jedynski
|
3344449bf4
|
fixed choosing/viewing values from sharing tab
|
2018-12-08 10:55:53 +01:00 |
|
Adam Domagalski
|
1abae28ae9
|
Merge branch 'mapboxUpgrade' of s416084/find-my-tutor-android into develop
|
2018-12-08 09:13:31 +00:00 |
|
Domagalski
|
3a38c1052d
|
mapbox update + acra switch in settings
|
2018-12-08 10:10:53 +01:00 |
|
Mieszko Wrzeszczyński
|
c8e49af5da
|
Increase build version
|
2018-12-07 19:16:29 +01:00 |
|
Mieszko Wrzeszczyński
|
e5f7a81c9a
|
Merge branch 'develop' of s416084/find-my-tutor-android into master
|
2018-12-07 18:01:01 +00:00 |
|
Mieszko Wrzeszczyński
|
80cd393cc9
|
Merge branch 'PR-master-auto-online' of s416084/find-my-tutor-android into develop
|
2018-12-07 18:00:13 +00:00 |
|
Mieszko Wrzeszczyński
|
fd49c66ee1
|
Adjust to master
|
2018-12-07 18:59:30 +01:00 |
|
Mieszko Wrzeszczyński
|
77ddbc39a5
|
Merge branch 'develop' into PR-master-auto-online
|
2018-12-07 18:58:02 +01:00 |
|
Mieszko Wrzeszczyński
|
527701420b
|
Add onfline and offline zones
|
2018-12-07 18:57:26 +01:00 |
|
Adam Domagalski
|
f177b80fa4
|
Merge branch 'develop' into infoIcons
|
2018-12-07 15:18:15 +01:00 |
|
marcin.jedynski
|
f8abf61553
|
no misleading values but summary mising on fragment reload
|
2018-12-07 02:59:01 +01:00 |
|
Marcin Jedyński
|
5a8ec2d9fc
|
Merge branch 'fmt-296' of s416084/find-my-tutor-android into develop
|
2018-12-06 23:08:27 +00:00 |
|
marcin.jedynski
|
a9469cce76
|
reverted api url back to master
|
2018-12-06 23:58:47 +01:00 |
|
Mieszko Wrzeszczyński
|
26e12d68f3
|
Merge branch 'PR-master-auto-online' of s416084/find-my-tutor-android into master
|
2018-12-06 22:38:02 +00:00 |
|
Mieszko Wrzeszczyński
|
d735950e7a
|
Merge
|
2018-12-06 23:37:22 +01:00 |
|
Mieszko Wrzeszczyński
|
ca91124b8f
|
Merge branch 'master' into PR-master-auto-online
|
2018-12-06 23:28:21 +01:00 |
|
marcin.jedynski
|
8f6a07acea
|
Merge branch 'develop' of git.wmi.amu.edu.pl:s416084/find-my-tutor-android into develop
|
2018-12-06 22:45:15 +01:00 |
|
Mieszko Wrzeszczyński
|
8a44eaa8d0
|
Merge branch 'bg-task-increase-interval' of s416084/find-my-tutor-android into develop
|
2018-12-06 21:39:57 +00:00 |
|
Mieszko Wrzeszczyński
|
c96e19cb2d
|
Fix map
|
2018-12-06 22:38:22 +01:00 |
|
marcin.jedynski
|
367bc7518e
|
fixed toast on send feedback, minor model adjustment of feedback
|
2018-12-06 22:31:02 +01:00 |
|
Mieszko Wrzeszczyński
|
0182d2e041
|
Merge branch 'develop' into bg-task-increase-interval
|
2018-12-06 22:00:04 +01:00 |
|
Mieszko Wrzeszczyński
|
d9909a66bd
|
Adjust to develop
|
2018-12-06 21:59:37 +01:00 |
|
Mieszko Wrzeszczyński
|
0cec17dd16
|
Create handlers for coming in and out from building
|
2018-12-06 21:32:13 +01:00 |
|
Adam Domagalski
|
8be7d3aa11
|
Merge branch 'fix-fetching-coords-in-map' of s416084/find-my-tutor-android into develop
|
2018-12-05 23:59:19 +00:00 |
|
Domagalski
|
b4dd785504
|
map ico info in progress
|
2018-12-06 00:57:53 +01:00 |
|
Mieszko Wrzeszczyński
|
57702fd3a1
|
Merge branch 'develop' into fix-fetching-coords-in-map
|
2018-12-05 23:39:04 +01:00 |
|
Mieszko Wrzeszczyński
|
381373b4b7
|
Fetch markers only when screen is on
|
2018-12-05 23:38:13 +01:00 |
|
Adam Domagalski
|
45dac22ec4
|
Merge branch 'acraReporter' of s416084/find-my-tutor-android into develop
|
2018-12-05 21:49:52 +00:00 |
|
Domagalski
|
0dd0b0dc23
|
added some translation and removed throwing error for testing
|
2018-12-05 22:45:11 +01:00 |
|
Domagalski
|
d1adf451a0
|
Merge branch 'develop' into acraReporter
|
2018-12-05 21:26:12 +01:00 |
|
Mieszko Wrzeszczyński
|
261002d131
|
Merge branch 'develop' of s416084/find-my-tutor-android into master
|
2018-12-05 13:25:24 +00:00 |
|
Mieszko Wrzeszczyński
|
899fb9958b
|
Merge branch 'fix-sharing-active-id' of s416084/find-my-tutor-android into develop
|
2018-12-05 13:23:49 +00:00 |