Merge branch 'master' into develop (0f7b6001) · 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
0f7b6001

Commit 0f7b6001 authored 10 years ago by

PavelBegunkov

Downloads
- Plain Diff

Merge branch 'master' into develop

parents b79610fb 3abe6a1f

Branches

Tags

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

db/StoredProcedures.sql 1 addition, 1 deletion

db/StoredProcedures.sql
~dev_rating/application/classes/Controller/Handler/FileCreator.php 2 additions, 0 deletions

...ng/application/classes/Controller/Handler/FileCreator.php
~dev_rating/application/classes/Controller/Student/Subject.php 12 additions, 2 deletions

...rating/application/classes/Controller/Student/Subject.php
~dev_rating/application/classes/Controller/Teacher/GenFinalForm.php 0 additions, 92 deletions

...g/application/classes/Controller/Teacher/GenFinalForm.php
~dev_rating/application/views/student/index.twig 5 additions, 1 deletion

~dev_rating/application/views/student/index.twig
~dev_rating/application/views/student/subject.twig 7 additions, 0 deletions

~dev_rating/application/views/student/subject.twig
~dev_rating/docs/template credit.xls 0 additions, 0 deletions

~dev_rating/docs/template credit.xls
~dev_rating/docs/template exam.xls 0 additions, 0 deletions

~dev_rating/docs/template exam.xls
~dev_rating/media/css/student/subject.css 1 addition, 1 deletion

~dev_rating/media/css/student/subject.css

with 28 additions and 97 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