|
|
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 |
|
|
|
509562a76c
|
Merge branch 'news' into journal
# Conflicts:
# app/Http/Controllers/Users/TeacherController.php
|
2020-12-16 22:47:08 +07:00 |
|
|
|
be8af67c61
|
Модуль журнала
|
2020-12-16 05:22:28 +07:00 |
|
nikden13
|
045a767774
|
auth
|
2020-12-16 03:13:20 +07:00 |
|
ashen-1-dev
|
459fd1c37d
|
Новости(CRUD + PhotoStorage)
|
2020-12-15 19:46:13 +07:00 |
|
nikden13
|
4a8e802c03
|
общий код
|
2020-12-03 23:33:04 +07:00 |
|
|
|
54732a9f6a
|
Регистрация и вход для всех ролей
|
2020-12-02 23:58:36 +07:00 |
|
