Merge remote-tracking branch 'origin/develop' into feature/DB_refactoring
Conflicts: db/StoredProcedures.sql
Showing
- .gitignore 2 additions, 1 deletion.gitignore
- db/StoredProcedures.sql 29 additions, 4 deletionsdb/StoredProcedures.sql
- db/fix.sql 14 additions, 11 deletionsdb/fix.sql
- ~dev_rating/application/bootstrap.php 1 addition, 0 deletions~dev_rating/application/bootstrap.php
- ~dev_rating/application/classes/Controller/Student/Index.php 1 addition, 1 deletion~dev_rating/application/classes/Controller/Student/Index.php
- ~dev_rating/application/classes/Controller/Teacher/Index.php 1 addition, 1 deletion~dev_rating/application/classes/Controller/Teacher/Index.php
- ~dev_rating/application/classes/Controller/Teacher/Rating.php 1 addition, 1 deletion..._rating/application/classes/Controller/Teacher/Rating.php
- ~dev_rating/application/classes/Controller/UserEnvi.php 10 additions, 1 deletion~dev_rating/application/classes/Controller/UserEnvi.php
- ~dev_rating/application/classes/Model/DataArr/Semesters.php 2 additions, 1 deletion~dev_rating/application/classes/Model/DataArr/Semesters.php
- ~dev_rating/application/updates.txt 5 additions, 3 deletions~dev_rating/application/updates.txt
- ~dev_rating/application/updates_log.txt 7 additions, 1 deletion~dev_rating/application/updates_log.txt
- ~dev_rating/application/views/base.twig 1 addition, 1 deletion~dev_rating/application/views/base.twig
- ~dev_rating/application/views/email/recovery.twig 9 additions, 19 deletions~dev_rating/application/views/email/recovery.twig
- ~dev_rating/application/views/sign.twig 2 additions, 2 deletions~dev_rating/application/views/sign.twig
- ~dev_rating/application/views/student/index.twig 7 additions, 5 deletions~dev_rating/application/views/student/index.twig
- ~dev_rating/application/views/teacher/discipline/CreateDiscipline.twig 17 additions, 15 deletions...pplication/views/teacher/discipline/CreateDiscipline.twig
- ~dev_rating/application/views/teacher/discipline/EditGroups.twig 1 addition, 1 deletion...ting/application/views/teacher/discipline/EditGroups.twig
- ~dev_rating/application/views/teacher/discipline/EditSettings.twig 3 additions, 1 deletion...ng/application/views/teacher/discipline/EditSettings.twig
- ~dev_rating/application/views/teacher/exam.twig 13 additions, 4 deletions~dev_rating/application/views/teacher/exam.twig
- ~dev_rating/application/views/teacher/index.twig 13 additions, 9 deletions~dev_rating/application/views/teacher/index.twig
Please register or sign in to comment