Commit Graph

294 Commits

Author SHA1 Message Date
8a29b93533 Revert to LDAP login 2018-11-20 23:23:44 +01:00
Adam Domagalski
70001e36c3 cancel button improved
handle runnable for tmp sending manual location
2018-11-20 22:56:30 +01:00
5e1e3b5bce Merge branch 'approximated-localizations' of s416084/find-my-tutor-android into develop 2018-11-20 21:44:52 +00:00
157855d911 Merge with dev 2018-11-20 22:44:38 +01:00
b02ec917ed Add markers filter 2018-11-20 22:29:07 +01:00
d62c451adb button choose from map redirects to mapActivity 2018-11-20 15:26:42 +01:00
892216cc0c Fix search button 2018-11-20 00:19:17 +01:00
50a427313f Improve user search 2018-11-20 00:08:18 +01:00
Adam Domagalski
e1496ce65c Merge branch 'approximated-localizations' into mapManualLocation 2018-11-19 22:19:01 +01:00
d5114a8587 Add presence mode 2018-11-19 11:49:28 +01:00
aa3c2eb9b8 Send middle of polygon in approximated mode 2018-11-19 00:03:31 +01:00
1acac4edc4 sharing tab redesigned 2018-11-18 16:26:59 +01:00
b0e81d474e Merge branch 'sendFeedbackAndBugToDrawer' of s416084/find-my-tutor-android into develop 2018-11-18 01:10:45 +00:00
e0973ca732 manual merge to develop 2018-11-18 02:10:25 +01:00
5dad15f135 removed unused imports from baseactivity 2018-11-18 01:58:17 +01:00
e664e00212 refactor, moved code from baseactivity to feedbackutils class 2018-11-18 01:53:07 +01:00
Adam Domagalski
49f47986f0 recon my own marker 2018-11-17 19:56:57 +01:00
Adam Domagalski
bb4831ec89 typo 2018-11-17 17:47:36 +01:00
Adam Domagalski
c04373a59c manual location fixing 2018-11-17 17:46:27 +01:00
0aa87c44fa Merge branch 'mapBoundsArea' of s416084/find-my-tutor-android into develop 2018-11-17 15:33:42 +00:00
Adam Domagalski
fd9cb37fb3 bound area improvment, toggle bounding box in menu fab 2018-11-17 16:30:52 +01:00
Marcin Jedynski
8669e040b5 adjusted modals for feedback/bug 2018-11-13 23:59:39 +01:00
Marcin Jedynski
f89971d059 added feedback model and service, added sending feedback 2018-11-13 12:16:01 +01:00
5d3ba7e1a1 Merge branch 'mapBoundsArea' of s416084/find-my-tutor-android into develop 2018-11-12 21:19:50 +00:00
Adam Domagalski
8083b67fc4 code refractor - moved boundries method into mapUtils 2018-11-12 19:26:41 +01:00
Adam Domagalski
bca8cb782b Map bound area for WMI added 2018-11-12 16:13:56 +01:00
Marcin Jedynski
c9b4548f45 added modal asking for user data for bug/feedback report 2018-11-12 00:51:35 +01:00
Marcin Jedynski
1323c02b30 added code for sending email 2018-11-11 19:55:17 +01:00
Marcin Jedynski
9f23aae620 added bug icon to resources 2018-11-11 15:54:35 +01:00
Marcin Jedynski
35311af645 added string values and options to drawer 2018-11-11 15:31:11 +01:00
e34ccbb6d8 Merge branch 'develop' of s416084/find-my-tutor-android into master 2018-11-10 17:52:35 +00:00
d1a249e5cf Merge branch 'firstReleseToMaster' of s416084/find-my-tutor-android into develop 2018-11-10 17:48:32 +00:00
Adam Domagalski
b64280bf3f 1st alpha release 2018-11-10 18:35:53 +01:00
77b7c50e4e Add approximated localization 2018-11-09 00:50:15 +01:00
64b24cef1b Add approximated localizations 2018-11-09 00:49:09 +01:00
647b030b81 Merge branch 'developToMapPravilnie' of s416084/find-my-tutor-android into develop 2018-11-07 07:56:56 +00:00
98cc5bcc20 Merge branch 'develop' into developToMapPravilnie 2018-11-07 08:51:12 +01:00
511d1a8fef Merge branch 'change-user-login-data' of s416084/find-my-tutor-android into develop 2018-11-07 07:45:56 +00:00
505e890f8b Add custom status & change userName 2018-11-07 08:45:09 +01:00
Adam Domagalski
5d595c4c65 if statemnt added in case of empty 2018-11-07 00:28:19 +01:00
Adam Domagalski
295be86eee Merge branch 'develop' into developToMapPravilnie 2018-11-07 00:01:41 +01:00
Adam Domagalski
9cd0f053e3 Merge branch 'developToMapPravilnie' of git.wmi.amu.edu.pl:s416084/find-my-tutor-android into developToMapPravilnie 2018-11-07 00:00:23 +01:00
Adam Domagalski
5f65d8e6fb marker removing 2018-11-06 23:51:46 +01:00
1094ef942b Add FusedLocalizationApi 2018-11-06 23:50:13 +01:00
c62b901c10 Merge branch 'developToMapPravilnie' of s416084/find-my-tutor-android into develop 2018-11-06 09:35:38 +00:00
b23d82d74d Merge from develop & add label to coordinate on map 2018-11-06 10:30:27 +01:00
ba4e097f86 Merge branch 'attachedSharingTabToBacgroundTask' of s416084/find-my-tutor-android into develop 2018-11-06 02:06:56 +00:00
Marcin Jedynski
5757a58edf adjusted background task and shared pref file to work together throught PrefUtils 2018-11-06 03:04:17 +01:00
583305ff31 Add modal on marker click 2018-11-05 23:25:29 +01:00
03235ce18b Handle properly background task life cycle 2018-11-05 10:37:25 +01:00