Merge branch 'hotfix/esc_and_exam_form' into develop (4ac4c9d4) · Commits · Anton Yushko / grade · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

G

grade
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Anton Yushko
grade
Commits
4ac4c9d4

Commit 4ac4c9d4 authored 9 years ago by

RomanSteinberg

Downloads
- Plain Diff

Merge branch 'hotfix/esc_and_exam_form' into develop

Conflicts:
	~dev_rating/application/classes/Model/Rating.php
	~dev_rating/media/js/rating.js

parents 164cb446 81c91425

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 1 deletion

.gitignore
db/StoredFunctions.sql 4 additions, 4 deletions

db/StoredFunctions.sql
db/StoredProcedures.sql 22 additions, 16 deletions

db/StoredProcedures.sql
db/Structure.sql 7 additions, 7 deletions

db/Structure.sql
db/fix.sql 17 additions, 20 deletions

db/fix.sql
~dev_rating/application/classes/Controller/Handler/FileCreator.php 15 additions, 3 deletions

...ng/application/classes/Controller/Handler/FileCreator.php
~dev_rating/application/classes/Controller/Handler/Rating.php 33 additions, 7 deletions

..._rating/application/classes/Controller/Handler/Rating.php
~dev_rating/application/classes/Controller/Teacher/Rating.php 2 additions, 1 deletion

..._rating/application/classes/Controller/Teacher/Rating.php
~dev_rating/application/classes/Model/Rating.php 9 additions, 7 deletions

~dev_rating/application/classes/Model/Rating.php
~dev_rating/application/views/teacher/exam.twig 4 additions, 2 deletions

~dev_rating/application/views/teacher/exam.twig
~dev_rating/media/js/rating.js 186 additions, 114 deletions

~dev_rating/media/js/rating.js

with 301 additions and 182 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment