Commit Graph

253 Commits

Author SHA1 Message Date
a52e5dd89b Increase version 2018-11-29 22:34:31 +01:00
79d48bb269 Fix BG & markers filter & boundaries 2018-11-29 22:31:47 +01:00
f6cfb7f352 Version to deploy 2018-11-29 12:15:58 +01:00
1e07168725 adjuested feedback model 2018-11-28 18:37:48 +01:00
d7bc56f5f9 adjust code to master 2018-11-28 09:37:38 +01:00
c452e5dbf5 Fix BG & UI 2018-11-27 20:53:01 +01:00
ab74f0b7e1 Fix manual pop up windows 2018-11-27 19:52:36 +01:00
Adam Domagalski
66dba76ed4 istutor bugifx map 2018-11-27 16:12:02 +01:00
8fbce4d9d3 Merge branch 'tutorProfile' of s416084/find-my-tutor-android into develop 2018-11-27 13:52:39 +00:00
Marcin Jedynski
e96981c8b9 fixed post update tutortab 2018-11-27 14:51:55 +01:00
519115ed5e Merge branch 'tutorProfile' of s416084/find-my-tutor-android into develop 2018-11-27 12:09:41 +00:00
Marcin Jedynski
c43aabf739 added save/fetch functionality to tutortab 2018-11-27 13:03:45 +01:00
6dbe50761a Fix retrofit rxjava 2018-11-27 11:45:50 +01:00
2b19229552 added icons, translations, renamed activites in manifest 2018-11-27 11:40:02 +01:00
abbd887db7 added basic layout and fetching of profile activity, but save note not implemented yet, got some problems 2018-11-27 06:51:49 +01:00
6684274488 Merge branch 'saveManualLocation' of s416084/find-my-tutor-android into develop 2018-11-27 05:33:39 +00:00
50ef5b1e8b merge 2018-11-27 06:21:19 +01:00
bbc7803177 added handling of choosing manual location from list in sharing tab 2018-11-27 03:10:33 +01:00
3177b43f26 Merge branch 'fix-login-as-student' of s416084/find-my-tutor-android into develop 2018-11-26 23:27:38 +00:00
012f2af3f2 Fix login 2018-11-27 00:26:43 +01:00
db3ac7378c Merge branch 'markers-types' of s416084/find-my-tutor-android into develop 2018-11-26 23:17:43 +00:00
789a2dbaf1 Merge from dev 2018-11-27 00:16:36 +01:00
ba67a8b088 Add predifined 2018-11-27 00:00:37 +01:00
52ff05767e Merge branch 'mapManualLocation' of s416084/find-my-tutor-android into develop 2018-11-26 22:57:48 +00:00
Adam Domagalski
64082727b2 static marker bug removal 2018-11-26 23:54:12 +01:00
Adam Domagalski
9b291117ef temporary timestamp check for removing marker 2018-11-26 23:04:35 +01:00
493395d36a moved manualLocation logic from MapActivity to ManualLocationUtils 2018-11-26 20:54:54 +01:00
3a2c4f10d4 Improve marker browser 2018-11-26 20:22:04 +01:00
b14052eb21 Merge branch 'mapManualLocationBug/locationLevel' of s416084/find-my-tutor-android into mapManualLocation 2018-11-26 16:17:54 +00:00
854ddadeea fixed switching location mode, adding custom status, and switching on location service when choosing manual location from map tab 2018-11-26 16:21:29 +01:00
35ba11129c added fake validate 2018-11-26 13:02:38 +01:00
Adam Domagalski
ffff4bb7c0 green locs bug fixed 2018-11-26 09:13:27 +01:00
Adam Domagalski
da944c37d5 manual location connected to sharing tab and uses bg task for sending cors 2018-11-26 00:46:36 +01:00
f0df7b7440 Add proper markers icons 2018-11-25 22:27:57 +01:00
aef7174d90 Add new markers 2018-11-24 00:11:06 +01:00
422b1079da Change icon when user change localization level 2018-11-23 23:36:04 +01:00
73fc5f9b0b Add default icon for each type of localization 2018-11-23 22:27:59 +01:00
554c2f7bfa Merge branch 'devToMasterAlpha3' of s416084/find-my-tutor-android into master 2018-11-22 12:42:44 +00:00
Adam Domagalski
ac27fc3f34 alpha3 without dev fucnitons 2018-11-22 13:39:48 +01:00
fca6cd936c Merge branch 'mapManualLocation' of s416084/find-my-tutor-android into develop 2018-11-22 11:45:13 +00:00
Adam Domagalski
4eb721fb1a button add rm manual quick fix 2018-11-22 12:41:44 +01:00
be6a487a92 Merge branch 'sendFeedbackAndBugToDrawer' of s416084/find-my-tutor-android into develop 2018-11-21 07:49:44 +00:00
2b4e2d3b99 merge v2 2018-11-21 08:46:06 +01:00
f4ea4a4378 Merge branch 'approximated-localizations' of s416084/find-my-tutor-android into develop 2018-11-21 07:37:49 +00:00
b75e3e5ae3 Improve logging 2018-11-21 08:37:23 +01:00
18841ab372 Merge branch 'develop' into approximated-localizations 2018-11-21 08:13:19 +01:00
fce151be6f Change endpoint for users 2018-11-21 08:11:48 +01:00
6fb4b655d8 Merge branch 'minorUiFixes' of s416084/find-my-tutor-android into develop 2018-11-21 04:01:21 +00:00
b8eedc565c hiden tutor portion of drawer if student logged in 2018-11-21 04:59:50 +01:00
f2357c846e merge 2018-11-21 04:38:36 +01:00