Merge branch 'develop'
Showing
- db/StoredProcedures.sql 68 additions, 13 deletionsdb/StoredProcedures.sql
- db/fix.sql 1 addition, 1 deletiondb/fix.sql
- patches/patch_mpdf_1.diff 26 additions, 0 deletionspatches/patch_mpdf_1.diff
- patches/patch_mpdf_2.diff 28 additions, 0 deletionspatches/patch_mpdf_2.diff
- ~dev_rating/application/classes/Controller/Handler/AdmStudents.php 38 additions, 2 deletions...ng/application/classes/Controller/Handler/AdmStudents.php
- ~dev_rating/application/classes/Controller/Handler/Settings.php 4 additions, 2 deletions...ating/application/classes/Controller/Handler/Settings.php
- ~dev_rating/application/classes/Controller/Teacher/Rating.php 69 additions, 51 deletions..._rating/application/classes/Controller/Teacher/Rating.php
- ~dev_rating/application/classes/DataArr/Students.php 2 additions, 2 deletions~dev_rating/application/classes/DataArr/Students.php
- ~dev_rating/application/classes/Model/Admin/Students.php 2 additions, 1 deletion~dev_rating/application/classes/Model/Admin/Students.php
- ~dev_rating/application/classes/Model/DataArr/Students.php 4 additions, 3 deletions~dev_rating/application/classes/Model/DataArr/Students.php
- ~dev_rating/application/classes/Model/DataArr/Teachers.php 10 additions, 2 deletions~dev_rating/application/classes/Model/DataArr/Teachers.php
- ~dev_rating/application/classes/Model/Student.php 1 addition, 1 deletion~dev_rating/application/classes/Model/Student.php
- ~dev_rating/application/classes/Model/System.php 3 additions, 1 deletion~dev_rating/application/classes/Model/System.php
- ~dev_rating/application/classes/Model/Teacher/Map.php 23 additions, 8 deletions~dev_rating/application/classes/Model/Teacher/Map.php
- ~dev_rating/application/classes/Model/errMessages.php 4 additions, 1 deletion~dev_rating/application/classes/Model/errMessages.php
- ~dev_rating/application/updates.txt 2 additions, 5 deletions~dev_rating/application/updates.txt
- ~dev_rating/application/updates_log.txt 4 additions, 1 deletion~dev_rating/application/updates_log.txt
- ~dev_rating/application/views/admin/students/index.twig 11 additions, 9 deletions~dev_rating/application/views/admin/students/index.twig
- ~dev_rating/application/views/teacher/discipline/CreateDiscipline.twig 6 additions, 4 deletions...pplication/views/teacher/discipline/CreateDiscipline.twig
- ~dev_rating/application/views/teacher/discipline/EditSettings.twig 9 additions, 3 deletions...ng/application/views/teacher/discipline/EditSettings.twig
Please register or sign in to comment