Commit Graph

65 Commits

Author SHA1 Message Date
895c6da9fd Merge branch 'master' of git.wmi.amu.edu.pl:s452108/atcheck 2019-12-16 18:49:15 +01:00
f219eba3bd Integracja z czytnikiem 2019-12-16 18:48:29 +01:00
e671e683e5 Merge branch 'master' of git.wmi.amu.edu.pl:s452108/atcheck 2019-12-16 18:40:21 +01:00
634fa8f835 Merge remote-tracking branch 'origin/master' 2019-12-16 18:38:35 +01:00
ddfb2aaf61 Integracja z czytnikiem 2019-12-16 18:38:30 +01:00
ff59170cef bootstrao folder added to git 2019-12-16 17:21:42 +01:00
bb3af844ca Merge branch 'master' of git.wmi.amu.edu.pl:s452108/atcheck 2019-12-16 15:49:44 +01:00
4fb02f960e code expiration fixed 2019-12-16 15:49:25 +01:00
72fda159ce Merge remote-tracking branch 'origin/master'
# Conflicts:
#	app/Http/Controllers/User/UserSubjectsController.php
2019-12-16 15:46:03 +01:00
cc6b3afff1 Integracja z czytnikiem 2019-12-16 15:45:28 +01:00
f2970e4c0a fix for default weekday 2019-12-15 12:43:40 +01:00
03aaf21519 xlsx sheet updated 2019-12-14 23:14:52 +01:00
db8621837f xlsx sheet title updated 2019-12-14 22:41:09 +01:00
857b5eed17 fix for too long xlsx sheet title 2019-12-14 22:38:00 +01:00
2999478790 composer update 2019-12-14 22:21:49 +01:00
054f5dfd61 map frontend fixes 2019-12-14 22:16:19 +01:00
fa12959122 Merge branch 'master' of git.wmi.amu.edu.pl:s452108/atcheck 2019-12-14 22:03:48 +01:00
2ed41c54df export to xlsx added, map preview fixed 2019-12-14 22:03:41 +01:00
Olga
063e0641c9 Merge branch 'master' of https://git.wmi.amu.edu.pl/s452108/atcheck 2019-12-14 17:26:31 +01:00
Olga
6d7b2a3b05 CHEC-47 commit 2019-12-14 17:26:20 +01:00
fa2f05b01f css fix for home 2019-12-14 00:43:54 +01:00
5809a366ad css fix for home and seat map 2019-12-14 00:37:54 +01:00
1fd1d5dddd css updated 2019-12-14 00:09:51 +01:00
85b453b16e Merge branch 'master' of git.wmi.amu.edu.pl:s452108/atcheck 2019-12-13 23:28:22 +01:00
9df9c7cb4e map preview added, nav updated 2019-12-13 23:28:16 +01:00
Olga
cce61938b8 update koncowastrona css 2019-12-13 21:24:56 +01:00
Olga
afd066fe00 update seatchart css 2019-12-13 19:01:01 +01:00
Olga
5f4d411096 update przylozlegitke css 2019-12-13 16:55:05 +01:00
Olga
de06beeb6d Merge branch 'master' of https://git.wmi.amu.edu.pl/s452108/atcheck 2019-12-09 14:22:04 +01:00
Olga
517460fef3 CHEC-41 panel studenta 2019-12-09 14:21:49 +01:00
edc432bd2e favicon fixed 2019-12-09 12:57:59 +01:00
0c29866387 favicon added, room name display fixed 2019-12-09 12:54:57 +01:00
d15054c069 favicon added 2019-12-09 12:36:36 +01:00
680753d7dc classes display fix 2019-12-09 12:25:32 +01:00
ab3778b238 Merge branch 'master' of git.wmi.amu.edu.pl:s452108/atcheck 2019-12-09 12:17:30 +01:00
5bc28b56cd room arrangements added 2019-12-09 12:17:23 +01:00
Olga
c69d6292a8 Merge branch 'master' of https://git.wmi.amu.edu.pl/s452108/atcheck 2019-12-08 22:34:05 +01:00
Olga
1c2b7cec92 CHEC-42: add professor views 2019-12-08 22:33:37 +01:00
a5c9c2cb86 Merge branch 'master' of git.wmi.amu.edu.pl:s452108/atcheck 2019-12-08 00:01:07 +01:00
581429d99f app deployed with Heroku 2019-12-08 00:00:52 +01:00
d3ab78fd82 map frontend fixes 2019-12-07 22:49:36 +01:00
9b9525b569 Merge branch 'master' of git.wmi.amu.edu.pl:s452108/atcheck 2019-12-07 22:16:11 +01:00
81a03268a7 js map controlles updated, README updated 2019-12-07 22:16:05 +01:00
3d13bdb8bb js map controllers created 2019-12-07 19:49:42 +01:00
Olga
eb377c8caa show chosen seat 2019-12-07 11:56:51 +01:00
1636111b64 Merge branch 'master' of git.wmi.amu.edu.pl:s452108/atcheck 2019-12-06 22:34:34 +01:00
0363feda51 text lanbuage changed to PL, models updated 2019-12-06 22:34:25 +01:00
Olga
d1f6775a8f add student views 2019-12-06 18:34:19 +01:00
bc41ccb8be db classes seeder fixed 2019-12-06 13:46:32 +01:00
0d1b25871b middleware for classes starting created 2019-12-04 16:55:59 +01:00