-
- Downloads
FIX #20175 TIME 0:05 fix conflicts in lang/en.json and lang/fr.json + merge...
FIX #20175 TIME 0:05 fix conflicts in lang/en.json and lang/fr.json + merge branch 'develop' into 'feat/20175/develop'
No related branches found
No related tags found
Showing
- .npmrc 1 addition, 0 deletions.npmrc
- angular.json 1 addition, 0 deletionsangular.json
- lang/en.json 13 additions, 0 deletionslang/en.json
- lang/fr.json 13 additions, 0 deletionslang/fr.json
- package.json 4 additions, 0 deletionspackage.json
- rest/index.php 1 addition, 0 deletionsrest/index.php
- src/app/docserver/models/DocserverModel.php 49 additions, 12 deletionssrc/app/docserver/models/DocserverModel.php
- src/app/document/controllers/DocumentController.php 114 additions, 4 deletionssrc/app/document/controllers/DocumentController.php
- src/app/document/models/DocumentModel.php 18 additions, 12 deletionssrc/app/document/models/DocumentModel.php
- src/app/group/controllers/PrivilegeController.php 2 additions, 1 deletionsrc/app/group/controllers/PrivilegeController.php
- src/app/history/controllers/HistoryController.php 6 additions, 5 deletionssrc/app/history/controllers/HistoryController.php
- src/app/search/controllers/SearchController.php 34 additions, 9 deletionssrc/app/search/controllers/SearchController.php
- src/app/user/controllers/UserController.php 9 additions, 5 deletionssrc/app/user/controllers/UserController.php
- src/core/controllers/AuthenticationController.php 9 additions, 1 deletionsrc/core/controllers/AuthenticationController.php
- src/frontend/app/administration/group/group.component.scss 4 additions, 0 deletionssrc/frontend/app/administration/group/group.component.scss
- src/frontend/app/search/search.component.html 21 additions, 5 deletionssrc/frontend/app/search/search.component.html
- src/frontend/app/search/search.component.scss 12 additions, 0 deletionssrc/frontend/app/search/search.component.scss
- src/frontend/app/search/search.component.ts 118 additions, 21 deletionssrc/frontend/app/search/search.component.ts
- test/unitTests/app/user/UserControllerTest.php 2 additions, 1 deletiontest/unitTests/app/user/UserControllerTest.php
Loading
Please register or sign in to comment