Merge branch 'hotline#36925_admin_users_index' into 'stable' (98888916) · Commits · afi / opacce · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

opacce
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Wiki
- Releases
- Environments
- 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.

afi
opacce
Commits
98888916

Commit 98888916 authored 9 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge branch 'hotline#36925_admin_users_index' into 'stable'

Hotline#36925 admin users index

See merge request !1459

parents 3168e62a e44a752a

Branches

Tags

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/36925 2 additions, 0 deletions

VERSIONS_HOTLINE/36925
application/modules/admin/controllers/UsersController.php 44 additions, 45 deletions

application/modules/admin/controllers/UsersController.php
application/modules/admin/views/scripts/users/index.phtml 1 addition, 55 deletions

application/modules/admin/views/scripts/users/index.phtml
library/Class/Users.php 58 additions, 42 deletions

library/Class/Users.php
library/ZendAfi/Form/Admin/SearchUsers.php 76 additions, 0 deletions

library/ZendAfi/Form/Admin/SearchUsers.php
library/ZendAfi/View/Helper/Admin/SearchUsers.php 123 additions, 0 deletions

library/ZendAfi/View/Helper/Admin/SearchUsers.php
tests/application/modules/admin/controllers/UsersControllerTest.php 108 additions, 11 deletions

...ication/modules/admin/controllers/UsersControllerTest.php
tests/fixtures/onedtouch_error_response.html 7 additions, 0 deletions

tests/fixtures/onedtouch_error_response.html

with 419 additions and 153 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