Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

41226fad

Verified Commit 41226fad authored 6 years ago by Damien

Downloads
- Patches
- Plain Diff

FEAT #310 Reactivate deleted user

parent 94b4c364

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

apps/maarch_entreprise/js/angular/app/administration/user-administration.component.ts 23 additions, 6 deletions

...gular/app/administration/user-administration.component.ts
apps/maarch_entreprise/js/angular/lang/lang-en.ts 1 addition, 0 deletions

apps/maarch_entreprise/js/angular/lang/lang-en.ts
apps/maarch_entreprise/js/angular/lang/lang-fr.ts 1 addition, 0 deletions

apps/maarch_entreprise/js/angular/lang/lang-fr.ts
apps/maarch_entreprise/lang/en.php 0 additions, 18 deletions

apps/maarch_entreprise/lang/en.php
apps/maarch_entreprise/lang/fr.php 0 additions, 18 deletions

apps/maarch_entreprise/lang/fr.php
rest/index.php 1 addition, 0 deletions

rest/index.php
src/app/user/controllers/UserController.php 44 additions, 3 deletions

src/app/user/controllers/UserController.php
src/core/lang/lang-en.php 4 additions, 0 deletions

src/core/lang/lang-en.php
src/core/lang/lang-fr.php 4 additions, 0 deletions

src/core/lang/lang-fr.php

with 78 additions and 45 deletions

Loading

0% Loading 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