|
|
8e94d86968
|
Fix corner case
|
2019-01-03 20:03:46 +01:00 |
|
|
|
b81e28cd61
|
Fix online logic
|
2019-01-03 19:51:48 +01:00 |
|
|
|
8bcecbbed5
|
Change online trigger
|
2019-01-03 19:50:11 +01:00 |
|
|
|
ea0d6e1e96
|
Add save battery mode
|
2019-01-03 19:34:55 +01:00 |
|
|
|
88f263217a
|
Use fused and change loc mode
|
2019-01-03 17:39:34 +01:00 |
|
|
|
a4fd031a36
|
resolved case when selected entries are deleted, working towards enabling/disabling views when there are no items
|
2019-01-03 10:38:58 +01:00 |
|
|
|
94368b05d1
|
deleting works, needs some polishing like refreshing summaries and hiding buttons depending on the level of sharing
|
2019-01-03 02:12:17 +01:00 |
|
Maciej Wanat
|
b323939067
|
Text fixes
|
2019-01-02 19:16:04 +01:00 |
|
|
|
44e392c027
|
Add search on backend
|
2019-01-02 18:23:03 +01:00 |
|
|
|
9059cbd01d
|
Fix online icon
|
2019-01-02 17:42:10 +01:00 |
|
|
|
aec9eaae19
|
string fixes
|
2019-01-02 12:21:05 +01:00 |
|
|
|
c8e68e3bb6
|
Merge branch 'develop' into blackNwhiteLists
|
2019-01-02 11:49:55 +01:00 |
|
|
|
1a5c85c213
|
Adjust keyboard latout
|
2019-01-02 09:10:47 +01:00 |
|
|
|
0bf3d147f0
|
Don't use GPS when manual sharing has been choosen
|
2019-01-02 09:03:44 +01:00 |
|
|
|
4fd2795377
|
Add translation
|
2019-01-02 08:46:28 +01:00 |
|
|
|
9dd2a62d43
|
Add checkbox online/offline users
|
2019-01-02 00:17:03 +01:00 |
|
|
|
18547a3c52
|
Remove unnecessary code
|
2019-01-01 20:03:30 +01:00 |
|
|
|
7f169e5b61
|
Choose only fused location
|
2018-12-31 17:25:06 +01:00 |
|
|
|
87642c5d7a
|
blacklist ready to test
|
2018-12-30 21:14:10 +01:00 |
|
|
|
84e6b95675
|
Black list ready to test
|
2018-12-30 21:13:23 +01:00 |
|
|
|
2178b4d61d
|
Merge branch 'minor-text-fixes' of s416084/find-my-tutor-android into develop
|
2018-12-19 18:53:55 +00:00 |
|
Maciej Wanat
|
552badf5a9
|
Minor text fixes
|
2018-12-19 19:51:14 +01:00 |
|
|
|
69c42b323d
|
Add new build
|
2018-12-18 22:37:49 +01:00 |
|
|
|
956cd83f9b
|
Destroy listeners after fetching loclization
|
2018-12-18 21:43:15 +01:00 |
|
|
|
6334706165
|
Add release version
|
2018-12-18 20:01:54 +01:00 |
|
|
|
ac3e8310d1
|
On presence mode only on WMI
|
2018-12-18 19:13:59 +01:00 |
|
|
|
6030ec6d84
|
Merge branch 'fix-hints-content' of s416084/find-my-tutor-android into develop
|
2018-12-18 17:42:42 +00:00 |
|
|
|
7ac5ac2d6f
|
Convert to develop
|
2018-12-18 18:31:57 +01:00 |
|
|
|
bf6c8c3f51
|
Merge branch 'develop' into add-scrap-button
|
2018-12-18 00:03:43 +01:00 |
|
|
|
41c5dcebfd
|
Add scrap button
|
2018-12-18 00:01:35 +01:00 |
|
Maciej Wanat
|
020ec1d41e
|
Fix some of the messages content
|
2018-12-17 16:36:57 +01:00 |
|
|
|
8fdcdf4f80
|
almost working button, need to handle response
|
2018-12-17 16:20:58 +01:00 |
|
|
|
4d33a07a30
|
version code inc
|
2018-12-17 11:17:20 +01:00 |
|
|
|
60c7283ba1
|
Fix colors
|
2018-12-17 10:54:22 +01:00 |
|
|
|
ce14928bc6
|
fix duty hours
|
2018-12-17 10:41:09 +01:00 |
|
|
|
4bdebcf52d
|
Add strings
|
2018-12-17 10:39:37 +01:00 |
|
|
|
48ce4c76c8
|
Merge from develop
|
2018-12-17 10:34:25 +01:00 |
|
|
|
5bf380b666
|
git history fix
|
2018-12-17 01:36:58 +01:00 |
|
|
|
2d9c8aa6cc
|
Fix empty binding
|
2018-12-17 00:56:07 +01:00 |
|
|
|
00ea68379b
|
rmved test hint
|
2018-12-17 00:51:11 +01:00 |
|
|
|
3ddcccb176
|
minor adjustments
|
2018-12-17 00:48:35 +01:00 |
|
|
|
c1bf626bbc
|
changed hint strings
|
2018-12-17 00:45:38 +01:00 |
|
|
|
4fc348af56
|
Fix strings
|
2018-12-16 23:28:10 +01:00 |
|
|
|
df1b380152
|
Change duty hours model
|
2018-12-16 22:46:44 +01:00 |
|
|
|
9d82261be9
|
Fix duty hours
|
2018-12-16 22:45:44 +01:00 |
|
|
|
c1e20934e4
|
recycle view crash
|
2018-12-16 22:44:00 +01:00 |
|
|
|
e7a2ecf86a
|
Add new infoboxes
|
2018-12-16 22:14:55 +01:00 |
|
|
|
962a222fa8
|
minor cleanup
|
2018-12-16 18:19:58 +01:00 |
|
|
|
9f0ef0590d
|
Fix strings
|
2018-12-16 17:42:05 +01:00 |
|
|
|
7f16515074
|
translated strings, fixed validation filter
|
2018-12-16 17:37:18 +01:00 |
|
|
|
80b0948033
|
working on duty hours validation
|
2018-12-16 16:56:54 +01:00 |
|
|
|
e2a6bfd56c
|
Fix enabling BG
|
2018-12-16 16:19:32 +01:00 |
|
|
|
f7edee0c56
|
Fix handle BG
|
2018-12-16 14:47:14 +01:00 |
|
|
|
dee33a2ec3
|
info icon at toolbar + clean up
|
2018-12-16 00:13:49 +01:00 |
|
|
|
c8145323c5
|
refresh sharing tab
|
2018-12-15 23:45:02 +01:00 |
|
|
|
f37fe44f2e
|
added strings and adjusted layout but needs fixing for smaller screens
|
2018-12-15 22:59:34 +01:00 |
|
|
|
672a6bee06
|
teraz
|
2018-12-15 22:47:23 +01:00 |
|
|
|
41288f000b
|
Add modal to ask for BG
|
2018-12-15 21:49:08 +01:00 |
|
|
|
90aa21be1d
|
Info button on toolbar
|
2018-12-15 21:35:00 +01:00 |
|
|
|
baa8cac0e4
|
working dutyhour adapter
|
2018-12-15 17:35:20 +01:00 |
|
|
|
3139d41ba4
|
strings fixed, base url server moved to Const class
|
2018-12-15 15:29:29 +01:00 |
|
|
|
7dd3e0cc00
|
Merge branch 'develop' into infoIcons
|
2018-12-15 14:48:05 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
2f4f3c13b6
|
work in progress
|
2018-12-12 03:27:04 +01:00 |
|
|
|
355d800909
|
added fix for acre double strings
|
2018-12-12 00:09:01 +01:00 |
|
|
|
f15e86cb21
|
Merge branch 'develop' into fixUXSharingTab
|
2018-12-11 21:33:24 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
c05d03a4d0
|
Fix partially manual predefined locations
|
2018-12-01 11:49:27 +01: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 |
|
|
|
c452e5dbf5
|
Fix BG & UI
|
2018-11-27 20:53:01 +01:00 |
|
|
|
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 |
|
|
|
6dbe50761a
|
Fix retrofit rxjava
|
2018-11-27 11:45:50 +01:00 |
|
|
|
2b19229552
|
added icons, translations, renamed activites in manifest
|
2018-11-27 11:40:02 +01:00 |
|
|
|
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 |
|
|
|
50ef5b1e8b
|
merge
|
2018-11-27 06:21:19 +01:00 |
|
|
|
bbc7803177
|
added handling of choosing manual location from list in sharing tab
|
2018-11-27 03:10:33 +01:00 |
|
|
|
012f2af3f2
|
Fix login
|
2018-11-27 00:26:43 +01:00 |
|
|
|
789a2dbaf1
|
Merge from dev
|
2018-11-27 00:16:36 +01:00 |
|
|
|
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 |
|
|
|
493395d36a
|
moved manualLocation logic from MapActivity to ManualLocationUtils
|
2018-11-26 20:54:54 +01:00 |
|
|
|
3a2c4f10d4
|
Improve marker browser
|
2018-11-26 20:22:04 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
f0df7b7440
|
Add proper markers icons
|
2018-11-25 22:27:57 +01:00 |
|
|
|
aef7174d90
|
Add new markers
|
2018-11-24 00:11:06 +01:00 |
|
