robonen/education-project
1
0
Fork 0
mirror of https://github.com/robonen/education-project.git synced 2026-03-20 10:54:31 +00:00
Code Activity
32 Commits 4 Branches 0 Tags
f9ba08b5463d7d4c8dcb02c7ee987ace98469af2
Commit Graph

8 Commits

Author SHA1 Message Date
Robonen Andrew
b9326ad722 Merge branch 'journal' into timetable 
# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/Auth/RegisterController.php
#	app/Http/Controllers/TimetableController.php
#	app/Models/SchoolClass.php
#	app/Models/User.php
#	composer.lock
 2020-12-16 23:14:06 +07:00
Robonen Andrew
509562a76c Merge branch 'news' into journal 
# Conflicts:
#	app/Http/Controllers/Users/TeacherController.php
 2020-12-16 22:47:08 +07:00
nikden13
e19ab81ddd get user 2020-12-16 15:25:42 +07:00
Robonen Andrew
be8af67c61 Модуль журнала 2020-12-16 05:22:28 +07:00
nikden13
045a767774 auth 2020-12-16 03:13:20 +07:00
nikden13
c93ffe8b0f ответ при создании 2020-12-13 16:31:06 +07:00
nikden13
4a8e802c03 общий код 2020-12-03 23:33:04 +07:00
Andrew Robonen
54732a9f6a Регистрация и вход для всех ролей 2020-12-02 23:58:36 +07:00