Merge branch 'issue487_inactive_disciplines' into develop
Showing
- db/postgresql/issue487_inactive_disciplines.sql 290 additions, 0 deletionsdb/postgresql/issue487_inactive_disciplines.sql
- media/js/office/disciplines.js 30 additions, 0 deletionsmedia/js/office/disciplines.js
- media/less/office/list.less 8 additions, 0 deletionsmedia/less/office/list.less
- ~dev_rating/application/classes/Controller/Handler/Discipline.php 23 additions, 1 deletion...ing/application/classes/Controller/Handler/Discipline.php
- ~dev_rating/application/classes/Controller/Handler/Map.php 21 additions, 3 deletions~dev_rating/application/classes/Controller/Handler/Map.php
- ~dev_rating/application/classes/Controller/Office/Disciplines.php 3 additions, 1 deletion...ing/application/classes/Controller/Office/Disciplines.php
- ~dev_rating/application/classes/Model/Discipline.php 18 additions, 0 deletions~dev_rating/application/classes/Model/Discipline.php
- ~dev_rating/application/classes/Model/Disciplines.php 5 additions, 1 deletion~dev_rating/application/classes/Model/Disciplines.php
- ~dev_rating/application/views/office/disciplines/index.twig 16 additions, 0 deletions~dev_rating/application/views/office/disciplines/index.twig
Please register or sign in to comment