Commit Graph

346 Commits

Author SHA1 Message Date
marcin.jedynski 3ddcccb176 minor adjustments 2018-12-17 00:48:35 +01:00
marcin.jedynski c1bf626bbc changed hint strings 2018-12-17 00:45:38 +01:00
marcin.jedynski 962a222fa8 minor cleanup 2018-12-16 18:19:58 +01:00
marcin.jedynski 7f16515074 translated strings, fixed validation filter 2018-12-16 17:37:18 +01:00
marcin.jedynski 80b0948033 working on duty hours validation 2018-12-16 16:56:54 +01:00
marcin.jedynski f37fe44f2e added strings and adjusted layout but needs fixing for smaller screens 2018-12-15 22:59:34 +01:00
marcin.jedynski baa8cac0e4 working dutyhour adapter 2018-12-15 17:35:20 +01:00
marcin.jedynski 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
marcin.jedynski 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
marcin.jedynski 2f4f3c13b6 work in progress 2018-12-12 03:27:04 +01:00
Marcin Jedyński 8e5b33793d Merge branch 'fixUXSharingTab' of s416084/find-my-tutor-android into develop 2018-12-11 23:10:39 +00:00
marcin.jedynski 355d800909 added fix for acre double strings 2018-12-12 00:09:01 +01:00
marcin.jedynski f15e86cb21 Merge branch 'develop' into fixUXSharingTab 2018-12-11 21:33:24 +01:00
marcin.jedynski afd3463bec sharing tab stable version 1.1 2018-12-11 21:32:27 +01:00
Adam Domagalski 9ffa64e793 Merge branch 'infoIcons' of s416084/find-my-tutor-android into develop 2018-12-10 23:22:54 +00:00
Domagalski 5f8e03986a Merge branch 'develop' into infoIcons 2018-12-11 00:22:35 +01:00
Domagalski e34642fd6e info popups without on off switch 2018-12-11 00:04:01 +01:00
Mieszko Wrzeszczyński 2dda6ef65f Merge branch 'one-coord-master' of s416084/find-my-tutor-android into develop 2018-12-10 21:04:51 +00:00
Mieszko Wrzeszczyński 041375b53f Put version adjusted to master 2018-12-10 22:02:10 +01:00
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 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