 Domagalski
|
e34642fd6e
|
info popups without on off switch
|
2018-12-11 00:04:01 +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 |
|
Domagalski
|
fc428451a9
|
map info pop up
|
2018-12-08 13:20:03 +01:00 |
|
Adam Domagalski
|
f177b80fa4
|
Merge branch 'develop' into infoIcons
|
2018-12-07 15:18:15 +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 |
|
marcin.jedynski
|
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 |
 Mieszko Wrzeszczyński
|
8a44eaa8d0
|
Merge branch 'bg-task-increase-interval' of s416084/find-my-tutor-android into develop
|
2018-12-06 21:39:57 +00:00 |
|
Mieszko Wrzeszczyński
|
c96e19cb2d
|
Fix map
|
2018-12-06 22:38:22 +01:00 |
|
marcin.jedynski
|
367bc7518e
|
fixed toast on send feedback, minor model adjustment of feedback
|
2018-12-06 22:31:02 +01:00 |
|
Mieszko Wrzeszczyński
|
0182d2e041
|
Merge branch 'develop' into bg-task-increase-interval
|
2018-12-06 22:00:04 +01:00 |
|
Mieszko Wrzeszczyński
|
d9909a66bd
|
Adjust to develop
|
2018-12-06 21:59:37 +01:00 |
|
Mieszko Wrzeszczyński
|
0cec17dd16
|
Create handlers for coming in and out from building
|
2018-12-06 21:32:13 +01:00 |
|
Adam Domagalski
|
8be7d3aa11
|
Merge branch 'fix-fetching-coords-in-map' of s416084/find-my-tutor-android into develop
|
2018-12-05 23:59:19 +00:00 |
|
Domagalski
|
b4dd785504
|
map ico info in progress
|
2018-12-06 00:57:53 +01:00 |
|
Mieszko Wrzeszczyński
|
57702fd3a1
|
Merge branch 'develop' into fix-fetching-coords-in-map
|
2018-12-05 23:39:04 +01:00 |
|
Mieszko Wrzeszczyński
|
381373b4b7
|
Fetch markers only when screen is on
|
2018-12-05 23:38:13 +01:00 |
|
Adam Domagalski
|
45dac22ec4
|
Merge branch 'acraReporter' of s416084/find-my-tutor-android into develop
|
2018-12-05 21:49:52 +00:00 |
|
Domagalski
|
0dd0b0dc23
|
added some translation and removed throwing error for testing
|
2018-12-05 22:45:11 +01:00 |
|
Domagalski
|
d1adf451a0
|
Merge branch 'develop' into acraReporter
|
2018-12-05 21:26:12 +01:00 |
|
Mieszko Wrzeszczyński
|
899fb9958b
|
Merge branch 'fix-sharing-active-id' of s416084/find-my-tutor-android into develop
|
2018-12-05 13:23:49 +00:00 |
|
Mieszko Wrzeszczyński
|
ce3d261c48
|
Merge branch 'develop' into fix-sharing-active-id
|
2018-12-05 14:22:37 +01:00 |
|
Mieszko Wrzeszczyński
|
7fb1d90ab7
|
Increase build version
|
2018-12-05 14:22:04 +01:00 |
|
Mieszko Wrzeszczyński
|
e095e9069f
|
Merge branch 'fix-sharing-active-id' of s416084/find-my-tutor-android into develop
|
2018-12-05 13:18:56 +00:00 |
|
Mieszko Wrzeszczyński
|
f0f1e59947
|
Fix default value
|
2018-12-05 14:17:34 +01:00 |
|
Mieszko Wrzeszczyński
|
9c9402c8c1
|
Merge branch 'fix-ssl-config' of s416084/find-my-tutor-android into develop
|
2018-12-05 11:40:56 +00:00 |
|
Mieszko Wrzeszczyński
|
2ca64a66ba
|
Rollback ssl config
|
2018-12-05 12:25:31 +01:00 |
|
Mieszko Wrzeszczyński
|
fc4f49c3e0
|
Merge branch 'fix-approx-loc' of s416084/find-my-tutor-android into develop
|
2018-12-05 09:03:45 +00:00 |
|
Mieszko Wrzeszczyński
|
b2e5a0e0c5
|
Fix unknown location
|
2018-12-05 09:59:18 +01:00 |
|
Mieszko Wrzeszczyński
|
5e51be5d0b
|
First attempt
|
2018-12-05 00:45:16 +01:00 |
|
Mieszko Wrzeszczyński
|
5fc5140866
|
Merge branch 'improve-user-modal' of s416084/find-my-tutor-android into develop
|
2018-12-04 21:23:09 +00:00 |
|
Mieszko Wrzeszczyński
|
76c3ba5054
|
Change app icon
|
2018-12-04 22:18:16 +01:00 |
|
Mieszko Wrzeszczyński
|
15529eccb4
|
Merge branch 'master' of s416084/find-my-tutor-android into develop
|
2018-12-04 20:37:06 +00:00 |
|
Adam Domagalski
|
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 |
|
Mieszko Wrzeszczyński
|
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 |
|
Mieszko Wrzeszczyński
|
ee6d11fe44
|
Improve colors & margins
|
2018-12-02 16:28:20 +01:00 |
|
Mieszko Wrzeszczyński
|
7c1b9e4494
|
Merge branch 'develop' of s416084/find-my-tutor-android into master
|
2018-12-01 16:13:12 +00:00 |
|
Adam Domagalski
|
957cee1b23
|
Merge branch 'developMieszko27nov' of s416084/find-my-tutor-android into develop
|
2018-12-01 11:46:54 +00:00 |
|
Mieszko Wrzeszczyński
|
eb1ab75d6d
|
Merge branch 'develop' into developMieszko27nov
|
2018-12-01 11:50:17 +01:00 |
|
Mieszko Wrzeszczyński
|
c05d03a4d0
|
Fix partially manual predefined locations
|
2018-12-01 11:49:27 +01:00 |
|
Mieszko Wrzeszczyński
|
a7ba5bf27c
|
Merge branch 'developMieszko27nov' of s416084/find-my-tutor-android into master
|
2018-11-29 21:35:16 +00:00 |
|
Mieszko Wrzeszczyński
|
a52e5dd89b
|
Increase version
|
2018-11-29 22:34:31 +01:00 |
|
Mieszko Wrzeszczyński
|
79d48bb269
|
Fix BG & markers filter & boundaries
|
2018-11-29 22:31:47 +01:00 |
|
Mieszko Wrzeszczyński
|
f6cfb7f352
|
Version to deploy
|
2018-11-29 12:15:58 +01:00 |