Commit Graph

299 Commits

Author SHA1 Message Date
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
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
d735950e7a Merge 2018-12-06 23:37:22 +01:00
ca91124b8f Merge branch 'master' into PR-master-auto-online 2018-12-06 23:28:21 +01:00
8f6a07acea Merge branch 'develop' of git.wmi.amu.edu.pl:s416084/find-my-tutor-android into develop 2018-12-06 22:45:15 +01:00
8a44eaa8d0 Merge branch 'bg-task-increase-interval' of s416084/find-my-tutor-android into develop 2018-12-06 21:39:57 +00:00
c96e19cb2d Fix map 2018-12-06 22:38:22 +01:00
367bc7518e fixed toast on send feedback, minor model adjustment of feedback 2018-12-06 22:31:02 +01:00
0182d2e041 Merge branch 'develop' into bg-task-increase-interval 2018-12-06 22:00:04 +01:00
d9909a66bd Adjust to develop 2018-12-06 21:59:37 +01:00
0cec17dd16 Create handlers for coming in and out from building 2018-12-06 21:32:13 +01:00
8be7d3aa11 Merge branch 'fix-fetching-coords-in-map' of s416084/find-my-tutor-android into develop 2018-12-05 23:59:19 +00:00
57702fd3a1 Merge branch 'develop' into fix-fetching-coords-in-map 2018-12-05 23:39:04 +01:00
381373b4b7 Fetch markers only when screen is on 2018-12-05 23:38:13 +01:00
45dac22ec4 Merge branch 'acraReporter' of s416084/find-my-tutor-android into develop 2018-12-05 21:49:52 +00:00
0dd0b0dc23 added some translation and removed throwing error for testing 2018-12-05 22:45:11 +01:00
d1adf451a0 Merge branch 'develop' into acraReporter 2018-12-05 21:26:12 +01:00
261002d131 Merge branch 'develop' of s416084/find-my-tutor-android into master 2018-12-05 13:25:24 +00:00
899fb9958b Merge branch 'fix-sharing-active-id' of s416084/find-my-tutor-android into develop 2018-12-05 13:23:49 +00:00
ce3d261c48 Merge branch 'develop' into fix-sharing-active-id 2018-12-05 14:22:37 +01:00
7fb1d90ab7 Increase build version 2018-12-05 14:22:04 +01:00
e095e9069f Merge branch 'fix-sharing-active-id' of s416084/find-my-tutor-android into develop 2018-12-05 13:18:56 +00:00
f0f1e59947 Fix default value 2018-12-05 14:17:34 +01:00
118296aa03 Merge branch 'develop' of s416084/find-my-tutor-android into master 2018-12-05 11:41:14 +00:00
9c9402c8c1 Merge branch 'fix-ssl-config' of s416084/find-my-tutor-android into develop 2018-12-05 11:40:56 +00:00
2ca64a66ba Rollback ssl config 2018-12-05 12:25:31 +01:00
3eed883079 Merge branch 'develop' of s416084/find-my-tutor-android into master 2018-12-05 09:04:20 +00:00
fc4f49c3e0 Merge branch 'fix-approx-loc' of s416084/find-my-tutor-android into develop 2018-12-05 09:03:45 +00:00
b2e5a0e0c5 Fix unknown location 2018-12-05 09:59:18 +01:00
5e51be5d0b First attempt 2018-12-05 00:45:16 +01:00
5fc5140866 Merge branch 'improve-user-modal' of s416084/find-my-tutor-android into develop 2018-12-04 21:23:09 +00:00
76c3ba5054 Change app icon 2018-12-04 22:18:16 +01:00
15529eccb4 Merge branch 'master' of s416084/find-my-tutor-android into develop 2018-12-04 20:37:06 +00:00
7174d7d117 Merge branch 'android7okhttpQuickFix3dec' of s416084/find-my-tutor-android into master 2018-12-03 15:04:47 +00:00
Adam Domagalski
e3e88d168f eliptic curve cipher TLS change for android 7 nougat 2018-12-03 16:00:35 +01:00
6115958efb Add Lato font & improve user modal 2018-12-02 22:15:39 +01:00
Adam Domagalski
f3f2f3b90a acra wtih intented crash on manual loc select 2018-12-02 21:29:47 +01:00
ee6d11fe44 Improve colors & margins 2018-12-02 16:28:20 +01:00
7c1b9e4494 Merge branch 'develop' of s416084/find-my-tutor-android into master 2018-12-01 16:13:12 +00:00
957cee1b23 Merge branch 'developMieszko27nov' of s416084/find-my-tutor-android into develop 2018-12-01 11:46:54 +00:00
eb1ab75d6d Merge branch 'develop' into developMieszko27nov 2018-12-01 11:50:17 +01:00
c05d03a4d0 Fix partially manual predefined locations 2018-12-01 11:49:27 +01:00
a7ba5bf27c Merge branch 'developMieszko27nov' of s416084/find-my-tutor-android into master 2018-11-29 21:35:16 +00:00
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