Merge user list to develop #24

Merged
s416204 merged 25 commits from tutors-list-activity into develop 2018-11-02 18:00:23 +01:00

25 Commits

Author SHA1 Message Date
484f1a2114 Resolve merge from develop 2018-11-02 17:59:28 +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
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
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
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