Commit Graph

390 Commits

Author SHA1 Message Date
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
d80b83f2b5 Merge branch 'add-scrap-button' of s416084/find-my-tutor-android into develop 2018-12-18 17:41:49 +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
303841c14e Merge branch 'betaRelease' of s416084/find-my-tutor-android into develop 2018-12-17 10:21:09 +00:00
4d33a07a30 version code inc 2018-12-17 11:17:20 +01:00
1eeaee7da1 Merge branch 'fix-colors' of s416084/find-my-tutor-android into develop 2018-12-17 09:55:10 +00:00
60c7283ba1 Fix colors 2018-12-17 10:54:22 +01:00
cae8a22c25 Merge branch 'fix-tutor-tab-develop' of s416084/find-my-tutor-android into develop 2018-12-17 09:44:03 +00: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
6b1537cd77 Merge branch 'tempBranch' of s416084/find-my-tutor-android into develop 2018-12-17 00:37:51 +00:00
5bf380b666 git history fix 2018-12-17 01:36:58 +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
fe0115122d Merge branch 'fix-manual-sharing' of s416084/find-my-tutor-android into develop 2018-12-16 22:33:46 +00:00
4fc348af56 Fix strings 2018-12-16 23:28:10 +01:00
5f48949014 Merge branch 'develop' into fix-manual-sharing 2018-12-16 22:47:22 +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
e7a2ecf86a Add new infoboxes 2018-12-16 22:14:55 +01:00
a0f78aef2d Revert "Merge branch 'extendTutorTab' of s416084/find-my-tutor-android into develop"
This reverts commit 264f752b20, reversing
changes made to 6498f2e58d.
2018-12-16 18:31:04 +01:00
962a222fa8 minor cleanup 2018-12-16 18:19:58 +01:00
9f0ef0590d Fix strings 2018-12-16 17:42:05 +01:00
264f752b20 Merge branch 'extendTutorTab' of s416084/find-my-tutor-android into develop 2018-12-16 16:38:28 +00: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
6498f2e58d Merge branch 'infoIcons' of s416084/find-my-tutor-android into develop 2018-12-16 09:43:06 +00:00
b0ccb9cf4f Merge branch 'develop' into infoIcons 2018-12-16 10:39:19 +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
39da105bc8 Merge branch 'infoIcons' of s416084/find-my-tutor-android into develop 2018-12-15 17:34:20 +00: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