|
|
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 |
|
|
|
be8b5faa32
|
Merge branch 'task' into journal
# Conflicts:
# app/Http/Controllers/Users/StudentController.php
# app/Models/SchoolClass.php
# app/Models/Teacher.php
# composer.json
# composer.lock
# database/migrations/2020_12_03_104028_create_bank_task_files_table.php
# routes/api.php
|
2020-12-16 23:08:17 +07:00 |
|
|
|
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 |
|
|
|
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 |
|
ashen-1-dev
|
c9b4427d99
|
Новости(CRUD + PhotoStorage)
|
2020-12-15 16:35:50 +07:00 |
|
nikden13
|
c93ffe8b0f
|
ответ при создании
|
2020-12-13 16:31:06 +07:00 |
|
ashen-1-dev
|
9c3874a2a0
|
Модуль Задания(fix some bugs)
|
2020-12-11 01:47:33 +07:00 |
|
ashen-1-dev
|
854ffc83c8
|
Модуль Задания(fix some bugs)
|
2020-12-11 00:23:29 +07:00 |
|
ashen-1-dev
|
dda49ceb17
|
Модуль Задания
|
2020-12-10 21:14:51 +07:00 |
|
ashen-1-dev
|
ba578e9fdf
|
модуль Задания(почти готов)
|
2020-12-09 19:02:38 +07:00 |
|
nikden13
|
1765cf44d0
|
index метод
|
2020-12-09 13:42:28 +07:00 |
|
nikden13
|
3c93886fef
|
Получение предметов и учеников класса, классов учителя
|
2020-12-09 00:03:57 +07:00 |
|
nikden13
|
5b0ba96adf
|
исправление ошибок
|
2020-12-08 16:45:27 +07:00 |
|
nikden13
|
45bec16c7f
|
Создание, обновление, получение, фильтрация
|
2020-12-04 11:09:57 +07:00 |
|
nikden13
|
4a8e802c03
|
общий код
|
2020-12-03 23:33:04 +07:00 |
|
|
|
54732a9f6a
|
Регистрация и вход для всех ролей
|
2020-12-02 23:58:36 +07:00 |
|
