Commit Graph

262 Commits

Author SHA1 Message Date
Adam Domagalski
2332823ba8 removed duplicated acra 2018-12-11 19:24:45 +01: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
041375b53f Put version adjusted to master 2018-12-10 22:02:10 +01:00
f757f36312 Clear list during fetch 2018-12-10 21:11:42 +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
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
3a38c1052d mapbox update + acra switch in settings 2018-12-08 10:10:53 +01:00
c8e49af5da Increase build version 2018-12-07 19:16:29 +01:00
fd49c66ee1 Adjust to master 2018-12-07 18:59:30 +01:00
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
Adam Domagalski
f177b80fa4 Merge branch 'develop' into infoIcons 2018-12-07 15:18:15 +01:00
f8abf61553 no misleading values but summary mising on fragment reload 2018-12-07 02:59:01 +01: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
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
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
b4dd785504 map ico info in progress 2018-12-06 00:57:53 +01: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
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
7fb1d90ab7 Increase build version 2018-12-05 14:22:04 +01:00
f0f1e59947 Fix default value 2018-12-05 14:17:34 +01:00
2ca64a66ba Rollback ssl config 2018-12-05 12:25:31 +01: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
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