Merge branch 'office_search' into 'master' (006b6296) · 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
006b6296

Commit 006b6296 authored 9 years ago by

xamgore

Downloads
- Plain Diff

Merge branch 'office_search' into 'master'

Search control fixes and impovments

See merge request !29

parents f63fd0b3 555a4582

Branches

Tags

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

db/StoredProcedures.sql 2 additions, 1 deletion

db/StoredProcedures.sql
media/js/controls/search.js 58 additions, 13 deletions

media/js/controls/search.js
media/less/common/forms.less 6 additions, 0 deletions

media/less/common/forms.less
media/less/controls/search.less 45 additions, 0 deletions

media/less/controls/search.less
~dev_rating/application/classes/Controller/Handler/Search.php 8 additions, 8 deletions

..._rating/application/classes/Controller/Handler/Search.php
~dev_rating/application/views/controls/searchStudent.twig 3 additions, 0 deletions

~dev_rating/application/views/controls/searchStudent.twig
~dev_rating/application/views/controls/searchTeacher.twig 4 additions, 1 deletion

~dev_rating/application/views/controls/searchTeacher.twig
~dev_rating/application/views/office/students/search.twig 5 additions, 5 deletions

~dev_rating/application/views/office/students/search.twig
~dev_rating/application/views/office/teachers/search.twig 8 additions, 7 deletions

~dev_rating/application/views/office/teachers/search.twig

with 139 additions and 35 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