|
|
8553b934a6
|
hot fix
|
2018-11-03 16:02:01 +01:00 |
|
|
|
2c61d22db7
|
Merge branch 'multilangual-version' of s416084/find-my-tutor-android into develop
|
2018-11-03 14:03:45 +00:00 |
|
|
|
afbf736e63
|
Add working language switcher
|
2018-11-03 15:02:44 +01:00 |
|
|
|
d2b5fbf35d
|
Merge branch 'shared-settings-handle-background-task' of s416084/find-my-tutor-android into develop
|
2018-11-03 10:23:23 +00:00 |
|
|
|
d8cf220293
|
Improve UI of userlist
|
2018-11-03 11:21:52 +01:00 |
|
|
|
05e4de95c2
|
Run in thread
|
2018-11-02 23:21:01 +01:00 |
|
|
|
78957bb62b
|
Add stop and start possibility to background task
|
2018-11-02 21:46:05 +01:00 |
|
|
|
bf694594e4
|
Merge branch 'tutors-list-activity' of s416084/find-my-tutor-android into develop
|
2018-11-02 17:00:23 +00:00 |
|
|
|
484f1a2114
|
Resolve merge from develop
|
2018-11-02 17:59:28 +01:00 |
|
|
|
e4b33da25b
|
Refactor before merge to develop
|
2018-11-02 17:31:35 +01:00 |
|
|
|
44b84fef0e
|
Improve searching
|
2018-11-02 16:08:11 +01:00 |
|
|
|
aa3dbfb185
|
Add search to list
|
2018-11-02 15:45:18 +01:00 |
|
|
|
b21aff1ef0
|
Merge branch 'logging-activity-ldap' of s416084/find-my-tutor-android into develop
|
2018-11-02 10:44:41 +00:00 |
|
|
|
ca24cc5437
|
Add possibility to login with ldap login and password
|
2018-11-02 11:42:56 +01:00 |
|
|
|
b1dfb6611d
|
Merge branch 'fixedDrawerNavigation' of s416084/find-my-tutor-android into develop
|
2018-11-02 01:42:26 +00:00 |
|
|
|
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 |
|
|
|
7191fcf6e7
|
Fix loginActivity - there is possibility to use ordinary validate endpoint
|
2018-11-01 20:37:51 +01:00 |
|
|
|
d6710a5406
|
Rewrite activity to fragment
|
2018-10-30 23:55:21 +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 |
|
|
|
f5edf67c15
|
Working activity without bottom navigation
|
2018-10-30 19:03:20 +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 |
|
|
|
d4aa5b5261
|
Refactor & don't show user information when tutor tab does not exist
|
2018-10-28 17:40:16 +01:00 |
|
|
|
4701387d48
|
Add duty hours to user information modal
|
2018-10-28 12:18:49 +01:00 |
|
|
|
299e25d0f9
|
Add primitive modal about user
|
2018-10-27 23:58:51 +02:00 |
|
|
|
edd5fb76a3
|
A little refactor of user modal
|
2018-10-26 23:54:18 +02:00 |
|
|
|
b87646088c
|
Add modal with more comprehensive information about specific user
|
2018-10-26 23:50:03 +02:00 |
|
|
|
1e281b3ea5
|
Add status of particular user
|
2018-10-26 23:29:45 +02:00 |
|
|
|
49199ccc44
|
Add badgers
|
2018-10-26 21:52:19 +02:00 |
|
Adam Domagalski
|
b1af9f6798
|
code cleanup cont
|
2018-10-26 20:41:36 +02:00 |
|
|
|
c7231bc70a
|
Sort users by online category
|
2018-10-26 20:08:52 +02:00 |
|
|
|
31f7408ea6
|
get all tutors
|
2018-10-26 14:04:52 +02:00 |
|
|
|
aa6810a633
|
Working user list
|
2018-10-26 13:57:50 +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 |
|
