-
- Downloads
Merge branch 'develop' into 'feat/17671/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 5 additions, 0 deletionslang/en.json
- lang/fr.json 5 additions, 0 deletionslang/fr.json
- phpunit.xml 4 additions, 0 deletionsphpunit.xml
- rest/index.php 1 addition, 0 deletionsrest/index.php
- sql/data_fr.sql 18 additions, 18 deletionssql/data_fr.sql
- sql/structure.sql 1 addition, 0 deletionssql/structure.sql
- src/app/email/controllers/EmailController.php 1 addition, 1 deletionsrc/app/email/controllers/EmailController.php
- src/app/group/controllers/GroupController.php 76 additions, 37 deletionssrc/app/group/controllers/GroupController.php
- src/app/group/controllers/PrivilegeController.php 27 additions, 0 deletionssrc/app/group/controllers/PrivilegeController.php
- src/app/group/models/GroupPrivilegeModel.php 16 additions, 0 deletionssrc/app/group/models/GroupPrivilegeModel.php
- src/app/history/controllers/HistoryController.php 4 additions, 0 deletionssrc/app/history/controllers/HistoryController.php
- src/app/user/controllers/SignatureController.php 13 additions, 0 deletionssrc/app/user/controllers/SignatureController.php
- src/app/user/controllers/UserController.php 167 additions, 20 deletionssrc/app/user/controllers/UserController.php
- src/app/user/models/UserGroupModel.php 26 additions, 0 deletionssrc/app/user/models/UserGroupModel.php
- src/app/user/models/UserModel.php 5 additions, 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 56 additions, 42 deletionssrc/frontend/app/administration/group/group.component.html
Loading
Please register or sign in to comment