Merge remote-tracking branch 'refs/remotes/origin/master' into...
Merge remote-tracking branch 'refs/remotes/origin/master' into dev#93528_numel_prise_en_compte_des_types_de_documents Conflicts: library/Class/Notice/DoubleFinder.php
Branches
Tags
Showing
- .gitmodules 6 additions, 0 deletions.gitmodules
- INSTALL.en.md 3 additions, 0 deletionsINSTALL.en.md
- VERSIONS 151 additions, 0 deletionsVERSIONS
- application/modules/activitypub/controllers/ReviewController.php 310 additions, 0 deletions...tion/modules/activitypub/controllers/ReviewController.php
- application/modules/admin/controllers/AjaxController.php 2 additions, 1 deletionapplication/modules/admin/controllers/AjaxController.php
- application/modules/admin/controllers/AlbumController.php 28 additions, 5 deletionsapplication/modules/admin/controllers/AlbumController.php
- application/modules/admin/controllers/FederationReviewsController.php 64 additions, 0 deletions...modules/admin/controllers/FederationReviewsController.php
- application/modules/admin/controllers/JournalController.php 28 additions, 0 deletionsapplication/modules/admin/controllers/JournalController.php
- application/modules/admin/controllers/ProfilController.php 19 additions, 2 deletionsapplication/modules/admin/controllers/ProfilController.php
- application/modules/admin/controllers/RecordsController.php 13 additions, 0 deletionsapplication/modules/admin/controllers/RecordsController.php
- application/modules/admin/controllers/RedmineController.php 15 additions, 0 deletionsapplication/modules/admin/controllers/RedmineController.php
- application/modules/admin/controllers/TemplateController.php 2 additions, 2 deletionsapplication/modules/admin/controllers/TemplateController.php
- application/modules/admin/controllers/WidgetController.php 17 additions, 0 deletionsapplication/modules/admin/controllers/WidgetController.php
- application/modules/admin/views/scripts/album/import-ead.phtml 1 addition, 0 deletions...cation/modules/admin/views/scripts/album/import-ead.phtml
- application/modules/admin/views/scripts/federation-reviews/index.phtml 23 additions, 0 deletions...odules/admin/views/scripts/federation-reviews/index.phtml
- application/modules/admin/views/scripts/harvest/jamendo-browse.phtml 0 additions, 3 deletions.../modules/admin/views/scripts/harvest/jamendo-browse.phtml
- application/modules/admin/views/scripts/profil/_profil_row.phtml 19 additions, 8 deletions...tion/modules/admin/views/scripts/profil/_profil_row.phtml
- application/modules/admin/views/scripts/profil/accueil.phtml 0 additions, 1 deletionapplication/modules/admin/views/scripts/profil/accueil.phtml
- application/modules/admin/views/scripts/usergroup-agenda/index.phtml 7 additions, 12 deletions.../modules/admin/views/scripts/usergroup-agenda/index.phtml
- application/modules/api/controllers/UserController.php 1 addition, 1 deletionapplication/modules/api/controllers/UserController.php
Please register or sign in to comment