Merge branch 'develop'
Showing
- copy_map.sql 34 additions, 0 deletionscopy_map.sql
- db/postgresql/issue335_copy_map.sql 115 additions, 0 deletionsdb/postgresql/issue335_copy_map.sql
- deploy/phpConfig/sidePanel/admin.json 2 additions, 1 deletiondeploy/phpConfig/sidePanel/admin.json
- media/js/discipline/editStructure.js 258 additions, 26 deletionsmedia/js/discipline/editStructure.js
- media/js/office/config.js 21 additions, 0 deletionsmedia/js/office/config.js
- media/less/common/forms.less 1 addition, 1 deletionmedia/less/common/forms.less
- media/less/office/config.less 7 additions, 0 deletionsmedia/less/office/config.less
- ~dev_rating/application/classes/Controller/Handler/Config.php 21 additions, 0 deletions..._rating/application/classes/Controller/Handler/Config.php
- ~dev_rating/application/classes/Controller/Handler/Discipline.php 47 additions, 4 deletions...ing/application/classes/Controller/Handler/Discipline.php
- ~dev_rating/application/classes/Controller/Office/Config.php 14 additions, 0 deletions~dev_rating/application/classes/Controller/Office/Config.php
- ~dev_rating/application/classes/Controller/Teacher/Discipline/Edit.php 1 addition, 1 deletion...pplication/classes/Controller/Teacher/Discipline/Edit.php
- ~dev_rating/application/classes/Controller/Window.php 10 additions, 0 deletions~dev_rating/application/classes/Controller/Window.php
- ~dev_rating/application/classes/Model/Discipline.php 38 additions, 0 deletions~dev_rating/application/classes/Model/Discipline.php
- ~dev_rating/application/classes/Model/Teacher.php 3 additions, 2 deletions~dev_rating/application/classes/Model/Teacher.php
- ~dev_rating/application/views/office/config/index.twig 54 additions, 0 deletions~dev_rating/application/views/office/config/index.twig
- ~dev_rating/application/views/popup/copyStructureDialog.twig 23 additions, 7 deletions~dev_rating/application/views/popup/copyStructureDialog.twig
- ~dev_rating/application/views/teacher/discipline/edit/structure.twig 11 additions, 8 deletions.../application/views/teacher/discipline/edit/structure.twig
Please register or sign in to comment