 Domagalski
|
8fdcdf4f80
|
almost working button, need to handle response
|
2018-12-17 16:20:58 +01:00 |
|
Domagalski
|
4d33a07a30
|
version code inc
|
2018-12-17 11:17:20 +01:00 |
 Mieszko Wrzeszczyński
|
60c7283ba1
|
Fix colors
|
2018-12-17 10:54:22 +01:00 |
|
Mieszko Wrzeszczyński
|
ce14928bc6
|
fix duty hours
|
2018-12-17 10:41:09 +01:00 |
|
Mieszko Wrzeszczyński
|
4bdebcf52d
|
Add strings
|
2018-12-17 10:39:37 +01:00 |
|
Mieszko Wrzeszczyński
|
48ce4c76c8
|
Merge from develop
|
2018-12-17 10:34:25 +01:00 |
 marcin.jedynski
|
5bf380b666
|
git history fix
|
2018-12-17 01:36:58 +01:00 |
|
Mieszko Wrzeszczyński
|
2d9c8aa6cc
|
Fix empty binding
|
2018-12-17 00:56:07 +01:00 |
|
marcin.jedynski
|
00ea68379b
|
rmved test hint
|
2018-12-17 00:51:11 +01:00 |
|
marcin.jedynski
|
3ddcccb176
|
minor adjustments
|
2018-12-17 00:48:35 +01:00 |
|
marcin.jedynski
|
c1bf626bbc
|
changed hint strings
|
2018-12-17 00:45:38 +01:00 |
|
Mieszko Wrzeszczyński
|
4fc348af56
|
Fix strings
|
2018-12-16 23:28:10 +01:00 |
|
Mieszko Wrzeszczyński
|
df1b380152
|
Change duty hours model
|
2018-12-16 22:46:44 +01:00 |
|
Mieszko Wrzeszczyński
|
9d82261be9
|
Fix duty hours
|
2018-12-16 22:45:44 +01:00 |
|
Domagalski
|
c1e20934e4
|
recycle view crash
|
2018-12-16 22:44:00 +01:00 |
|
Mieszko Wrzeszczyński
|
e7a2ecf86a
|
Add new infoboxes
|
2018-12-16 22:14:55 +01:00 |
|
marcin.jedynski
|
962a222fa8
|
minor cleanup
|
2018-12-16 18:19:58 +01:00 |
|
Mieszko Wrzeszczyński
|
9f0ef0590d
|
Fix strings
|
2018-12-16 17:42:05 +01:00 |
|
marcin.jedynski
|
7f16515074
|
translated strings, fixed validation filter
|
2018-12-16 17:37:18 +01:00 |
|
marcin.jedynski
|
80b0948033
|
working on duty hours validation
|
2018-12-16 16:56:54 +01:00 |
|
Mieszko Wrzeszczyński
|
e2a6bfd56c
|
Fix enabling BG
|
2018-12-16 16:19:32 +01:00 |
|
Mieszko Wrzeszczyński
|
f7edee0c56
|
Fix handle BG
|
2018-12-16 14:47:14 +01:00 |
|
Domagalski
|
dee33a2ec3
|
info icon at toolbar + clean up
|
2018-12-16 00:13:49 +01:00 |
|
Mieszko Wrzeszczyński
|
c8145323c5
|
refresh sharing tab
|
2018-12-15 23:45:02 +01:00 |
|
marcin.jedynski
|
f37fe44f2e
|
added strings and adjusted layout but needs fixing for smaller screens
|
2018-12-15 22:59:34 +01:00 |
|
Domagalski
|
672a6bee06
|
teraz
|
2018-12-15 22:47:23 +01:00 |
|
Mieszko Wrzeszczyński
|
41288f000b
|
Add modal to ask for BG
|
2018-12-15 21:49:08 +01:00 |
|
Domagalski
|
90aa21be1d
|
Info button on toolbar
|
2018-12-15 21:35:00 +01:00 |
|
marcin.jedynski
|
baa8cac0e4
|
working dutyhour adapter
|
2018-12-15 17:35:20 +01:00 |
|
Domagalski
|
3139d41ba4
|
strings fixed, base url server moved to Const class
|
2018-12-15 15:29:29 +01:00 |
|
Domagalski
|
7dd3e0cc00
|
Merge branch 'develop' into infoIcons
|
2018-12-15 14:48:05 +01:00 |
|
marcin.jedynski
|
0884fc4873
|
Merge branch 'extendTutorTab' of git.wmi.amu.edu.pl:s416084/find-my-tutor-android into extendTutorTab
|
2018-12-15 00:33:41 +01:00 |
|
marcin.jedynski
|
e775961ed2
|
created duty hour adapter
|
2018-12-15 00:33:09 +01:00 |
Marcin Jedynski
|
a3a847fdeb
|
moved duty hours to the center of the screen
|
2018-12-13 10:33:02 +01:00 |
|
Adam Domagalski
|
f568cea711
|
popups text color half black
|
2018-12-12 11:23:45 +01:00 |
|
marcin.jedynski
|
2f4f3c13b6
|
work in progress
|
2018-12-12 03:27:04 +01:00 |
|
marcin.jedynski
|
355d800909
|
added fix for acre double strings
|
2018-12-12 00:09:01 +01:00 |
|
marcin.jedynski
|
f15e86cb21
|
Merge branch 'develop' into fixUXSharingTab
|
2018-12-11 21:33:24 +01:00 |
|
marcin.jedynski
|
afd3463bec
|
sharing tab stable version 1.1
|
2018-12-11 21:32:27 +01:00 |
|
Adam Domagalski
|
0c1bfb46c2
|
no opacity
|
2018-12-11 19:28:35 +01:00 |
|
Adam Domagalski
|
2332823ba8
|
removed duplicated acra
|
2018-12-11 19:24:45 +01:00 |
|
Domagalski
|
5f8e03986a
|
Merge branch 'develop' into infoIcons
|
2018-12-11 00:22:35 +01:00 |
|
Domagalski
|
e34642fd6e
|
info popups without on off switch
|
2018-12-11 00:04:01 +01:00 |
|
Mieszko Wrzeszczyński
|
041375b53f
|
Put version adjusted to master
|
2018-12-10 22:02:10 +01:00 |
|
Mieszko Wrzeszczyński
|
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 |
|
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 |
|
Mieszko Wrzeszczyński
|
023926e36c
|
Merge branch 'one-cord-per-user' of s416084/find-my-tutor-android into develop
|
2018-12-10 09:49:55 +00:00 |
|
marcin.jedynski
|
930876a2f5
|
sharing tab stable release
|
2018-12-10 01:16:18 +01:00 |
|
Mieszko Wrzeszczyński
|
4c2f706422
|
Add put for cord
|
2018-12-10 00:00:04 +01:00 |
|
marcin.jedynski
|
764518d49c
|
:Merge branch 'develop' into fixUXSharingTab
|
2018-12-09 23:47:33 +01:00 |
|
marcin.jedynski
|
5ffdf75b66
|
polished sharing tab
|
2018-12-09 23:45:16 +01:00 |
|
Mieszko Wrzeszczyński
|
385df14b2f
|
Merge
|
2018-12-09 18:54:18 +01:00 |
|
Domagalski
|
fc428451a9
|
map info pop up
|
2018-12-08 13:20:03 +01:00 |
|
Marcin Jedyński
|
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 |
|
Domagalski
|
3a38c1052d
|
mapbox update + acra switch in settings
|
2018-12-08 10:10:53 +01:00 |
|
Mieszko Wrzeszczyński
|
c8e49af5da
|
Increase build version
|
2018-12-07 19:16:29 +01:00 |
|
Mieszko Wrzeszczyński
|
fd49c66ee1
|
Adjust to master
|
2018-12-07 18:59:30 +01:00 |
|
Mieszko Wrzeszczyński
|
77ddbc39a5
|
Merge branch 'develop' into PR-master-auto-online
|
2018-12-07 18:58:02 +01:00 |
|
Mieszko Wrzeszczyński
|
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 |
|
marcin.jedynski
|
f8abf61553
|
no misleading values but summary mising on fragment reload
|
2018-12-07 02:59:01 +01:00 |
|
marcin.jedynski
|
a9469cce76
|
reverted api url back to master
|
2018-12-06 23:58:47 +01:00 |
|
Mieszko Wrzeszczyński
|
d735950e7a
|
Merge
|
2018-12-06 23:37:22 +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 |
|
Adam Domagalski
|
9b291117ef
|
temporary timestamp check for removing marker
|
2018-11-26 23:04:35 +01:00 |
|
marcin.jedynski
|
493395d36a
|
moved manualLocation logic from MapActivity to ManualLocationUtils
|
2018-11-26 20:54:54 +01:00 |
|
Mieszko Wrzeszczyński
|
3a2c4f10d4
|
Improve marker browser
|
2018-11-26 20:22:04 +01:00 |
|
marcin.jedynski
|
854ddadeea
|
fixed switching location mode, adding custom status, and switching on location service when choosing manual location from map tab
|
2018-11-26 16:21:29 +01:00 |
|
marcin.jedynski
|
35ba11129c
|
added fake validate
|
2018-11-26 13:02:38 +01:00 |
|
Adam Domagalski
|
ffff4bb7c0
|
green locs bug fixed
|
2018-11-26 09:13:27 +01:00 |
|
Adam Domagalski
|
da944c37d5
|
manual location connected to sharing tab and uses bg task for sending cors
|
2018-11-26 00:46:36 +01:00 |
|
Mieszko Wrzeszczyński
|
f0df7b7440
|
Add proper markers icons
|
2018-11-25 22:27:57 +01:00 |
|
Mieszko Wrzeszczyński
|
aef7174d90
|
Add new markers
|
2018-11-24 00:11:06 +01:00 |
|
Mieszko Wrzeszczyński
|
422b1079da
|
Change icon when user change localization level
|
2018-11-23 23:36:04 +01:00 |
|
Mieszko Wrzeszczyński
|
73fc5f9b0b
|
Add default icon for each type of localization
|
2018-11-23 22:27:59 +01:00 |
|
Adam Domagalski
|
ac27fc3f34
|
alpha3 without dev fucnitons
|
2018-11-22 13:39:48 +01:00 |
|
Adam Domagalski
|
fca6cd936c
|
Merge branch 'mapManualLocation' of s416084/find-my-tutor-android into develop
|
2018-11-22 11:45:13 +00:00 |
|
Adam Domagalski
|
4eb721fb1a
|
button add rm manual quick fix
|
2018-11-22 12:41:44 +01:00 |
|
marcin.jedynski
|
2b4e2d3b99
|
merge v2
|
2018-11-21 08:46:06 +01:00 |
|
Mieszko Wrzeszczyński
|
b75e3e5ae3
|
Improve logging
|
2018-11-21 08:37:23 +01:00 |
|
Mieszko Wrzeszczyński
|
18841ab372
|
Merge branch 'develop' into approximated-localizations
|
2018-11-21 08:13:19 +01:00 |
|
Mieszko Wrzeszczyński
|
fce151be6f
|
Change endpoint for users
|
2018-11-21 08:11:48 +01:00 |
|
marcin.jedynski
|
b8eedc565c
|
hiden tutor portion of drawer if student logged in
|
2018-11-21 04:59:50 +01:00 |
|
marcin.jedynski
|
f2357c846e
|
merge
|
2018-11-21 04:38:36 +01:00 |
|
marcin.jedynski
|
8c9eb2c706
|
filled strings with polish names
|
2018-11-21 04:23:22 +01:00 |
|
marcin.jedynski
|
662b8c29c4
|
predefined status service linked to backend
|
2018-11-21 03:38:53 +01:00 |
|
Adam Domagalski
|
ffcc68c107
|
markers resizing
|
2018-11-21 00:43:42 +01:00 |
|
Adam Domagalski
|
549c2f6484
|
small modifs
|
2018-11-21 00:27:22 +01:00 |
|
Adam Domagalski
|
66de4ffa1d
|
...
|
2018-11-21 00:14:25 +01:00 |
|
Adam Domagalski
|
86cafe1d5a
|
Merge branch 'mapManualLocation' into tmp20nov
|
2018-11-20 23:58:35 +01:00 |
|
Mieszko Wrzeszczyński
|
688341e072
|
Remove crosshair from map
|
2018-11-20 23:46:38 +01:00 |
|
Mieszko Wrzeszczyński
|
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 |
|
Mieszko Wrzeszczyński
|
157855d911
|
Merge with dev
|
2018-11-20 22:44:38 +01:00 |
|
Mieszko Wrzeszczyński
|
b02ec917ed
|
Add markers filter
|
2018-11-20 22:29:07 +01:00 |
|
marcin.jedynski
|
d62c451adb
|
button choose from map redirects to mapActivity
|
2018-11-20 15:26:42 +01:00 |
|
Mieszko Wrzeszczyński
|
892216cc0c
|
Fix search button
|
2018-11-20 00:19:17 +01:00 |
|
Mieszko Wrzeszczyński
|
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 |
|
Mieszko Wrzeszczyński
|
d5114a8587
|
Add presence mode
|
2018-11-19 11:49:28 +01:00 |
|
Mieszko Wrzeszczyński
|
aa3c2eb9b8
|
Send middle of polygon in approximated mode
|
2018-11-19 00:03:31 +01:00 |
|
marcin.jedynski
|
1acac4edc4
|
sharing tab redesigned
|
2018-11-18 16:26:59 +01:00 |
|
marcin.jedynski
|
e0973ca732
|
manual merge to develop
|
2018-11-18 02:10:25 +01:00 |
|
marcin.jedynski
|
5dad15f135
|
removed unused imports from baseactivity
|
2018-11-18 01:58:17 +01:00 |