1
0
mirror of https://github.com/robonen/education-project.git synced 2026-03-20 02:44:31 +00:00
Commit Graph

9 Commits

Author SHA1 Message Date
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
ashen-1-dev
622170c647 Журнал(fixed some issues) 2020-12-16 20:38:32 +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
nikden13
3c93886fef Получение предметов и учеников класса, классов учителя 2020-12-09 00:03:57 +07:00
nikden13
4a8e802c03 общий код 2020-12-03 23:33:04 +07:00