|
27c92af38d
|
merge commit
|
2018-11-02 02:42:00 +01:00 |
|
|
7019864b9a
|
fixed comments
|
2018-11-02 02:05:02 +01:00 |
|
|
45c78e64c0
|
added logo and changed icons in drawer
|
2018-11-02 01:45:25 +01:00 |
|
|
ca26b03d49
|
Merge branch 'backToMainActivity' of s416084/find-my-tutor-android into develop
|
2018-10-30 22:13:09 +00:00 |
|
Adam Domagalski
|
2d9e041b6b
|
clean up
|
2018-10-30 20:25:16 +01:00 |
|
Adam Domagalski
|
b7b7f8a6a1
|
ds store deleted
mainasctivity
listview adapter
|
2018-10-30 20:24:53 +01:00 |
|
Adam Domagalski
|
2a79537fbe
|
rdy to develop
|
2018-10-30 19:35:40 +01:00 |
|
Adam Domagalski
|
9a2054deb2
|
shit commit
|
2018-10-30 19:22:35 +01:00 |
|
Adam Domagalski
|
9aca72bdfe
|
replace changed to put
|
2018-10-30 18:24:16 +01:00 |
|
|
d879258266
|
removed floating log out
|
2018-10-28 23:02:05 +01:00 |
|
|
b0cfda8548
|
fixed drawer
|
2018-10-28 22:58:53 +01:00 |
|
Adam Domagalski
|
d2405d36f6
|
finall clean up - ready to merge develop
|
2018-10-28 21:56:40 +01:00 |
|
Adam Domagalski
|
2c81359665
|
rm unused activities and layouts
|
2018-10-28 19:58:15 +01:00 |
|
Adam Domagalski
|
b1af9f6798
|
code cleanup cont
|
2018-10-26 20:41:36 +02:00 |
|
Adam Domagalski
|
5dab4eaf4b
|
bottom navi with frags and activities
|
2018-10-25 00:19:12 +02:00 |
|
|
d60a3c413c
|
fragment with background
|
2018-10-22 01:01:06 +02:00 |
|
|
091b714b18
|
working Markers with mixed adapter view and fragment layout
|
2018-10-20 18:09:28 +02:00 |
|
|
1d677ac7e1
|
Merge branch 'fix-background-task-timer' of s416084/find-my-tutor-android into develop
|
2018-10-20 13:24:02 +00:00 |
|
|
95978dad72
|
Fix executing timer
|
2018-10-20 15:18:40 +02:00 |
|
|
2b4b83a0d2
|
we going back
|
2018-10-20 11:54:41 +02:00 |
|
|
2568b03197
|
logout button
|
2018-10-20 10:45:34 +02:00 |
|
|
61e5faa81b
|
logout button
|
2018-10-18 09:03:48 +02:00 |
|
|
9162c7fd34
|
animacja markera, + stary zostaje
|
2018-10-18 01:46:36 +02:00 |
|
|
dc0af04e5d
|
startp activity change
|
2018-10-17 23:07:58 +02:00 |
|
|
f60bac1c3c
|
animated markers with some issues
|
2018-10-17 01:24:24 +02:00 |
|
|
bd775d5d0d
|
Merge branch 'sharing-tab-rest' of s416084/find-my-tutor-android into develop
|
2018-10-14 11:56:22 +00:00 |
|
|
10c3397949
|
Merge branch 'develop' of s416084/find-my-tutor-android into sharing-tab-rest
|
2018-10-14 10:47:20 +00:00 |
|
|
e9c4aef12c
|
Improve background-task & fetch user profile after logging
|
2018-10-14 12:46:33 +02:00 |
|
|
3584b1ce1e
|
Merge branch 'mapBoxsToDevelop' of s416084/find-my-tutor-android into develop
|
2018-10-13 20:44:36 +00:00 |
|
|
82f0ecd2b0
|
Merge branch 'mapBoxs' into mapBoxsToDevelop
|
2018-10-13 22:42:57 +02:00 |
|
|
19ba07beba
|
Merge branch 'sharing-tab-rest' of s416084/find-my-tutor-android into develop
|
2018-10-13 12:23:59 +00:00 |
|
|
5511e5b40e
|
Fix logging
|
2018-10-13 14:23:10 +02:00 |
|
|
1de4b0a2ab
|
Merge branch 'settingsActivity' of s416084/find-my-tutor-android into develop
|
2018-10-12 00:26:28 +00:00 |
|
|
fa519cf312
|
adjusted for merge
|
2018-10-12 02:25:26 +02:00 |
|
|
5cabcde90b
|
reversed changes on startup activity
|
2018-10-12 02:02:57 +02:00 |
|
|
c765ac0782
|
added overriding status/location list when manual entry added
|
2018-10-12 01:57:24 +02:00 |
|
|
d35262843a
|
Merge branch 'background-to-merge' of s416084/find-my-tutor-android into develop
|
2018-10-11 22:12:34 +00:00 |
|
|
2948ff7db9
|
Merge background-task into develop
|
2018-10-11 22:43:12 +02:00 |
|
|
2ebbe42d50
|
Resolve merge conflicts
|
2018-10-11 21:17:56 +02:00 |
|
|
850d588744
|
A little refactor before merge to develop
|
2018-10-11 20:57:57 +02:00 |
|
Marcin Jedynski
|
b87f859d75
|
updated strings
|
2018-10-11 12:54:52 +02:00 |
|
Marcin Jedynski
|
a98a500f08
|
added layout file for sharing tab
|
2018-10-11 12:53:50 +02:00 |
|
|
c78757da65
|
work in progress, splited activity into two, sharing tab and settings
|
2018-10-10 09:35:31 +02:00 |
|
|
ebb228fdec
|
elo
|
2018-10-10 01:09:09 +02:00 |
|
|
fcff6463bf
|
top coords
|
2018-10-09 23:55:46 +02:00 |
|
|
ae5c8d91e2
|
Add support for android O
|
2018-10-09 21:33:44 +02:00 |
|
|
6d6db2efe0
|
Add working background task in Android 6 (API 23)
|
2018-10-09 21:17:51 +02:00 |
|
|
1773b09aa3
|
Fix bug connected to empty localization afer start up
|
2018-10-07 20:32:17 +02:00 |
|
|
db689b569e
|
Merge with prev version
|
2018-10-07 15:56:08 +02:00 |
|
|
72252ebf87
|
Rollback to the first attempt with GoogleService
|
2018-10-07 15:51:37 +02:00 |
|