Merge branch 'develop' into 'fix/20778/develop'
# Conflicts: # lang/en.json # lang/fr.json
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 152 additions, 120 deletions.gitlab-ci.yml
- lang/en.json 3 additions, 1 deletionlang/en.json
- lang/fr.json 3 additions, 1 deletionlang/fr.json
- phpunit.xml 4 additions, 0 deletionsphpunit.xml
- src/app/email/controllers/EmailController.php 1 addition, 1 deletionsrc/app/email/controllers/EmailController.php
- src/app/user/controllers/UserController.php 5 additions, 2 deletionssrc/app/user/controllers/UserController.php
- src/app/user/models/UserModel.php 1 addition, 1 deletionsrc/app/user/models/UserModel.php
- src/core/controllers/AuthenticationController.php 1 addition, 1 deletionsrc/core/controllers/AuthenticationController.php
- src/core/models/DatabasePDO.php 2 additions, 2 deletionssrc/core/models/DatabasePDO.php
- src/core/models/PasswordModel.php 2 additions, 2 deletionssrc/core/models/PasswordModel.php
- src/frontend/app/administration/group/group.component.html 51 additions, 42 deletionssrc/frontend/app/administration/group/group.component.html
- src/frontend/app/administration/group/group.component.ts 6 additions, 1 deletionsrc/frontend/app/administration/group/group.component.ts
- src/frontend/app/administration/group/list/users.component.html 4 additions, 1 deletion...ontend/app/administration/group/list/users.component.html
- test/unitTests/app/user/UserControllerTest.php 77 additions, 14 deletionstest/unitTests/app/user/UserControllerTest.php
Loading
Please register or sign in to comment