Merge remote-tracking branch 'origin/develop' into develop (a6c5a6fa) · 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
a6c5a6fa

Commit a6c5a6fa authored 9 years ago by

Denis

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into develop

parents 6978639f 700677a9

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

db/StoredFunctions.sql 40 additions, 4 deletions

db/StoredFunctions.sql
~dev_rating/application/classes/Controller/Authentication.php 1 addition, 1 deletion

..._rating/application/classes/Controller/Authentication.php
~dev_rating/application/classes/Controller/Handler/Sign.php 6 additions, 1 deletion

~dev_rating/application/classes/Controller/Handler/Sign.php
~dev_rating/application/updates.txt 2 additions, 2 deletions

~dev_rating/application/updates.txt
~dev_rating/application/updates_log.txt 4 additions, 1 deletion

~dev_rating/application/updates_log.txt
~dev_rating/application/views/email/recovery.twig 3 additions, 3 deletions

~dev_rating/application/views/email/recovery.twig
~dev_rating/application/views/sign/up.twig 5 additions, 7 deletions

~dev_rating/application/views/sign/up.twig
~dev_rating/media/js/sign.js 5 additions, 1 deletion

~dev_rating/media/js/sign.js
~dev_rating/modules/account/classes/Kohana/Account.php 88 additions, 64 deletions

~dev_rating/modules/account/classes/Kohana/Account.php
~dev_rating/modules/account/classes/Model/Kohana/Account.php 6 additions, 5 deletions

~dev_rating/modules/account/classes/Model/Kohana/Account.php

with 160 additions and 89 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