Merge branch 'feature/gulp' into develop

0307fb63 · PavelBegunkov · 0a845ebe · 8db7e5a2 · 0307fb63 · 0307fb63
Commit 0307fb63 authored 9 years ago by PavelBegunkov
--- a/~dev_rating/application/views/dean_office/students/profile.twig
+++ b/~dev_rating/application/views/dean_office/students/profile.twig
--- a/~dev_rating/application/views/errors/http.twig
+++ b/~dev_rating/application/views/errors/http.twig
--- a/~dev_rating/application/views/profile/settings.twig
+++ b/~dev_rating/application/views/profile/settings.twig
--- a/~dev_rating/application/views/sign.twig
+++ b/~dev_rating/application/views/sign.twig
--- a/~dev_rating/application/views/student/index.twig
+++ b/~dev_rating/application/views/student/index.twig
--- a/~dev_rating/application/views/student/subject.twig
+++ b/~dev_rating/application/views/student/subject.twig
--- a/~dev_rating/application/views/teacher/coursework/create.twig
+++ b/~dev_rating/application/views/teacher/coursework/create.twig
--- a/~dev_rating/application/views/teacher/discipline/MapBase.twig
+++ b/~dev_rating/application/views/teacher/discipline/MapBase.twig
--- a/~dev_rating/application/views/teacher/discipline/create.twig
+++ b/~dev_rating/application/views/teacher/discipline/create.twig
--- a/~dev_rating/application/views/teacher/discipline/edit/groups.twig
+++ b/~dev_rating/application/views/teacher/discipline/edit/groups.twig
--- a/~dev_rating/application/views/teacher/discipline/edit/settings.twig
+++ b/~dev_rating/application/views/teacher/discipline/edit/settings.twig
--- a/~dev_rating/application/views/teacher/discipline/edit/structure.twig
+++ b/~dev_rating/application/views/teacher/discipline/edit/structure.twig
--- a/~dev_rating/application/views/teacher/discipline/edit/students.twig
+++ b/~dev_rating/application/views/teacher/discipline/edit/students.twig
--- a/~dev_rating/application/views/teacher/discipline/edit/teachers.twig
+++ b/~dev_rating/application/views/teacher/discipline/edit/teachers.twig
--- a/~dev_rating/application/views/teacher/exam.twig
+++ b/~dev_rating/application/views/teacher/exam.twig
--- a/~dev_rating/application/views/teacher/index.twig
+++ b/~dev_rating/application/views/teacher/index.twig
--- a/~dev_rating/application/views/teacher/javaAuth.twig
+++ b/~dev_rating/application/views/teacher/javaAuth.twig
--- a/~dev_rating/application/views/teacher/rating.twig
+++ b/~dev_rating/application/views/teacher/rating.twig
--- a/~dev_rating/index.php
+++ b/~dev_rating/index.php
--- a/~dev_rating/media/less/admin/common.css
+++ b/~dev_rating/media/less/admin/common.css