Merge branch 'master' of http://itlab.mmcs.sfedu.ru/git/grade-rating
Conflicts: db/NewEmpty.sql
Showing
- application/classes/Controller/Handler/Map.php 31 additions, 0 deletionsapplication/classes/Controller/Handler/Map.php
- application/views/teacher/map/create.twig 1 addition, 1 deletionapplication/views/teacher/map/create.twig
- application/views/teacher/map/edit.twig 6 additions, 4 deletionsapplication/views/teacher/map/edit.twig
- db/NewEmpty.sql 19 additions, 1575 deletionsdb/NewEmpty.sql
- db/StoredProcedures.sql 0 additions, 1 deletiondb/StoredProcedures.sql
- media/js/construct/attach.js 16 additions, 0 deletionsmedia/js/construct/attach.js
- media/js/construct/create.js 2 additions, 1 deletionmedia/js/construct/create.js
- media/js/construct/edit.js 10 additions, 0 deletionsmedia/js/construct/edit.js
Please register or sign in to comment