Commit Graph

545 Commits

Author SHA1 Message Date
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
2f4f3c13b6 work in progress 2018-12-12 03:27:04 +01:00
8e5b33793d Merge branch 'fixUXSharingTab' of s416084/find-my-tutor-android into develop 2018-12-11 23:10:39 +00:00
355d800909 added fix for acre double strings 2018-12-12 00:09:01 +01:00
f15e86cb21 Merge branch 'develop' into fixUXSharingTab 2018-12-11 21:33:24 +01:00
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
2147f533be Merge branch 'develop' into infoIcons 2018-12-11 19:25:21 +01:00
Adam Domagalski
2332823ba8 removed duplicated acra 2018-12-11 19:24:45 +01:00
9ffa64e793 Merge branch 'infoIcons' of s416084/find-my-tutor-android into develop 2018-12-10 23:22:54 +00:00
5f8e03986a Merge branch 'develop' into infoIcons 2018-12-11 00:22:35 +01:00
e34642fd6e info popups without on off switch 2018-12-11 00:04:01 +01:00
caa60e6f25 Merge branch 'develop' of s416084/find-my-tutor-android into master 2018-12-10 21:05:52 +00:00
2dda6ef65f Merge branch 'one-coord-master' of s416084/find-my-tutor-android into develop 2018-12-10 21:04:51 +00:00
041375b53f Put version adjusted to master 2018-12-10 22:02:10 +01:00
1803ac13b6 Merge branch 'fix-user-list' of s416084/find-my-tutor-android into develop 2018-12-10 20:14:13 +00:00
f757f36312 Clear list during fetch 2018-12-10 21:11:42 +01:00
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
03c5a9a3ce code clean up 2018-12-10 19:05:09 +01:00
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
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
023926e36c Merge branch 'one-cord-per-user' of s416084/find-my-tutor-android into develop 2018-12-10 09:49:55 +00:00
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
f4a0c71a18 Merge branch 'fixUXSharingTab' of s416084/find-my-tutor-android into develop 2018-12-10 00:53:24 +00:00
930876a2f5 sharing tab stable release 2018-12-10 01:16:18 +01:00
4c2f706422 Add put for cord 2018-12-10 00:00:04 +01:00
764518d49c :Merge branch 'develop' into fixUXSharingTab 2018-12-09 23:47:33 +01:00
5ffdf75b66 polished sharing tab 2018-12-09 23:45:16 +01:00
385df14b2f Merge 2018-12-09 18:54:18 +01:00
fc428451a9 map info pop up 2018-12-08 13:20:03 +01:00
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
1abae28ae9 Merge branch 'mapboxUpgrade' of s416084/find-my-tutor-android into develop 2018-12-08 09:13:31 +00:00
3a38c1052d mapbox update + acra switch in settings 2018-12-08 10:10:53 +01:00
c8e49af5da Increase build version 2018-12-07 19:16:29 +01:00
e5f7a81c9a Merge branch 'develop' of s416084/find-my-tutor-android into master 2018-12-07 18:01:01 +00:00
80cd393cc9 Merge branch 'PR-master-auto-online' of s416084/find-my-tutor-android into develop 2018-12-07 18:00:13 +00:00
fd49c66ee1 Adjust to master 2018-12-07 18:59:30 +01:00
77ddbc39a5 Merge branch 'develop' into PR-master-auto-online 2018-12-07 18:58:02 +01:00
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
f8abf61553 no misleading values but summary mising on fragment reload 2018-12-07 02:59:01 +01:00
5a8ec2d9fc Merge branch 'fmt-296' of s416084/find-my-tutor-android into develop 2018-12-06 23:08:27 +00:00
a9469cce76 reverted api url back to master 2018-12-06 23:58:47 +01:00
26e12d68f3 Merge branch 'PR-master-auto-online' of s416084/find-my-tutor-android into master 2018-12-06 22:38:02 +00:00
d735950e7a Merge 2018-12-06 23:37:22 +01:00