Commit Graph

457 Commits

Author SHA1 Message Date
b0ccb9cf4f Merge branch 'develop' into infoIcons 2018-12-16 10:39:19 +01:00
dee33a2ec3 info icon at toolbar + clean up 2018-12-16 00:13:49 +01:00
c8145323c5 refresh sharing tab 2018-12-15 23:45:02 +01:00
f37fe44f2e added strings and adjusted layout but needs fixing for smaller screens 2018-12-15 22:59:34 +01:00
672a6bee06 teraz 2018-12-15 22:47:23 +01:00
41288f000b Add modal to ask for BG 2018-12-15 21:49:08 +01:00
90aa21be1d Info button on toolbar 2018-12-15 21:35:00 +01:00
39da105bc8 Merge branch 'infoIcons' of s416084/find-my-tutor-android into develop 2018-12-15 17:34:20 +00:00
baa8cac0e4 working dutyhour adapter 2018-12-15 17:35:20 +01:00
3139d41ba4 strings fixed, base url server moved to Const class 2018-12-15 15:29:29 +01:00
7dd3e0cc00 Merge branch 'develop' into infoIcons 2018-12-15 14:48:05 +01:00
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
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