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.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
|
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 |
|
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 |
|
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
|
7fb1d90ab7
|
Increase build version
|
2018-12-05 14:22:04 +01:00 |
|
Mieszko Wrzeszczyński
|
f0f1e59947
|
Fix default value
|
2018-12-05 14:17:34 +01:00 |
|
Mieszko Wrzeszczyński
|
2ca64a66ba
|
Rollback ssl config
|
2018-12-05 12:25:31 +01: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 |
|
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
|
c05d03a4d0
|
Fix partially manual predefined locations
|
2018-12-01 11:49:27 +01: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 |
|
marcin.jedynski
|
1e07168725
|
adjuested feedback model
|
2018-11-28 18:37:48 +01:00 |
|
Mieszko Wrzeszczyński
|
d7bc56f5f9
|
adjust code to master
|
2018-11-28 09:37:38 +01:00 |
|
Mieszko Wrzeszczyński
|
c452e5dbf5
|
Fix BG & UI
|
2018-11-27 20:53:01 +01:00 |
|
Mieszko Wrzeszczyński
|
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 |
|
Marcin Jedynski
|
e96981c8b9
|
fixed post update tutortab
|
2018-11-27 14:51:55 +01:00 |
|
Marcin Jedynski
|
c43aabf739
|
added save/fetch functionality to tutortab
|
2018-11-27 13:03:45 +01:00 |
|
Mieszko Wrzeszczyński
|
6dbe50761a
|
Fix retrofit rxjava
|
2018-11-27 11:45:50 +01:00 |
|
marcin.jedynski
|
2b19229552
|
added icons, translations, renamed activites in manifest
|
2018-11-27 11:40:02 +01:00 |
|
marcin.jedynski
|
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 |
|
marcin.jedynski
|
50ef5b1e8b
|
merge
|
2018-11-27 06:21:19 +01:00 |
|
marcin.jedynski
|
bbc7803177
|
added handling of choosing manual location from list in sharing tab
|
2018-11-27 03:10:33 +01:00 |
|
Mieszko Wrzeszczyński
|
012f2af3f2
|
Fix login
|
2018-11-27 00:26:43 +01:00 |
|
Mieszko Wrzeszczyński
|
789a2dbaf1
|
Merge from dev
|
2018-11-27 00:16:36 +01:00 |
|
Mieszko Wrzeszczyński
|
ba67a8b088
|
Add predifined
|
2018-11-27 00:00:37 +01:00 |
|
Adam Domagalski
|
64082727b2
|
static marker bug removal
|
2018-11-26 23:54:12 +01:00 |