Merge branch 'issue487_inactive_disciplines' into develop (c54a213d) · 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
c54a213d

Commit c54a213d authored 5 years ago by

Anton Bagliy

Downloads
- Plain Diff

Merge branch 'issue487_inactive_disciplines' into develop

parents 0d07033b ede0b6a3

Branches

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

db/postgresql/issue487_inactive_disciplines.sql 290 additions, 0 deletions

db/postgresql/issue487_inactive_disciplines.sql
media/js/office/disciplines.js 30 additions, 0 deletions

media/js/office/disciplines.js
media/less/office/list.less 8 additions, 0 deletions

media/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

with 414 additions and 6 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