robonen/education-project
1
0
Fork 0
mirror of https://github.com/robonen/education-project.git synced 2026-03-20 02:44:31 +00:00
Code Activity
34 Commits 4 Branches 0 Tags
e4905831edd57f9d4a67ddff976d169e62320a61
Commit Graph

34 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nikden13
e4905831ed Merge branch 'timetable' of github.com:Robonen/education-project into timetable 2020-12-17 01:11:39 +07:00
nikden13
de0f849ff9 123 2020-12-17 01:09:22 +07:00
ashen-1-dev
f9ba08b546 Merge branch 'timetable' of https://github.com/Robonen/education-project into timetable 2020-12-17 00:29:15 +07:00
ashen-1-dev
1195db8958 Правки после слияния 2020-12-17 00:27:04 +07:00
nikden13
51f178ddd6 1 2020-12-16 23:58:00 +07:00
nikden13
523f70972b getuser 2020-12-16 23:53:37 +07:00
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
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
Robonen Andrew
509562a76c Merge branch 'news' into journal 
# Conflicts:
#	app/Http/Controllers/Users/TeacherController.php
 2020-12-16 22:47:08 +07:00
ashen-1-dev
9dd2ed1a67 Исправил конфликты после локального слияния 2020-12-16 22:03:46 +07:00
ashen-1-dev
74565e78e3 исправил конфликты после обновления ветки 2020-12-16 20:57:35 +07:00
ashen-1-dev
3fe74339d2 Merge branch 'task' into timetable 
# Conflicts:
#	app/Http/Controllers/Users/StudentController.php
#	app/Models/Teacher.php
#	composer.lock
#	routes/api.php
 2020-12-16 20:43:13 +07:00
ashen-1-dev
37bc147ba4 Новости(исправил ошибку с выводом) 2020-12-16 20:39:54 +07:00
ashen-1-dev
622170c647 Журнал(fixed some issues) 2020-12-16 20:38:32 +07:00
nikden13
1726a499d1 get user2 2020-12-16 15:31:35 +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
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
ashen-1-dev
84cded965e обновил composer (локально) 2020-12-15 00:05:38 +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
2e2942e42c по умолчанию возврат на текущую неделю 2020-12-10 00:14:00 +07:00
nikden13
127da069bd изменение создание расписания 2020-12-09 23:30:11 +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
Andrew Robonen
54732a9f6a Регистрация и вход для всех ролей 2020-12-02 23:58:36 +07:00