There was a problem fetching the pipeline stages.
Merge remote-tracking branch 'refs/remotes/origin/master' into...
Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#61314_explorateur_de_fichier_bokeh # Conflicts: # .htaccess
Showing
- .htaccess 1 addition, 1 deletion.htaccess
- VERSIONS 23 additions, 0 deletionsVERSIONS
- VERSIONS_WIP/59717 1 addition, 0 deletionsVERSIONS_WIP/59717
- application/modules/admin/controllers/ProfilController.php 16 additions, 1 deletionapplication/modules/admin/controllers/ProfilController.php
- application/modules/admin/controllers/WidgetController.php 60 additions, 11 deletionsapplication/modules/admin/controllers/WidgetController.php
- application/modules/admin/views/scripts/widget/version.phtml 1 addition, 0 deletionsapplication/modules/admin/views/scripts/widget/version.phtml
- application/modules/admin/views/scripts/widget/versions.phtml 44 additions, 0 deletions...ication/modules/admin/views/scripts/widget/versions.phtml
- application/modules/api/controllers/UserController.php 1 addition, 0 deletionsapplication/modules/api/controllers/UserController.php
- cosmogramme/sql/patch/patch_328.php 2 additions, 0 deletionscosmogramme/sql/patch/patch_328.php
- doc/extern_libs.org 1 addition, 1 deletiondoc/extern_libs.org
- library/Class/Codification.php 129 additions, 30 deletionslibrary/Class/Codification.php
- library/Class/CriteresRecherche.php 7 additions, 3 deletionslibrary/Class/CriteresRecherche.php
- library/Class/Migration/EditorFacetCodeBecomeW.php 109 additions, 0 deletionslibrary/Class/Migration/EditorFacetCodeBecomeW.php
- library/Class/Notice/RubriqueFacette.php 13 additions, 1 deletionlibrary/Class/Notice/RubriqueFacette.php
- library/Class/Systeme/ModulesAccueil.php 94 additions, 91 deletionslibrary/Class/Systeme/ModulesAccueil.php
- library/Class/Systeme/ModulesAccueil/Activities.php 1 addition, 0 deletionslibrary/Class/Systeme/ModulesAccueil/Activities.php
- library/Class/Systeme/ModulesAccueil/BibliothequeNumerique.php 1 addition, 0 deletions...ry/Class/Systeme/ModulesAccueil/BibliothequeNumerique.php
- library/Class/Systeme/ModulesAccueil/Calendrier.php 1 addition, 0 deletionslibrary/Class/Systeme/ModulesAccueil/Calendrier.php
- library/Class/Systeme/ModulesAccueil/CarteZones.php 2 additions, 0 deletionslibrary/Class/Systeme/ModulesAccueil/CarteZones.php
- library/Class/Systeme/ModulesAccueil/Compteurs.php 1 addition, 0 deletionslibrary/Class/Systeme/ModulesAccueil/Compteurs.php
Please register or sign in to comment