Merge remote-tracking branch 'refs/remotes/afi/master' into sandbox_#16325-Inspector-gadget
Conflicts: library/startup.php
Branches
Tags
Showing
- CONTRIB.en.md 175 additions, 0 deletionsCONTRIB.en.md
- CONTRIB.fr.md 1 addition, 1 deletionCONTRIB.fr.md
- INSTALL.en.md 179 additions, 0 deletionsINSTALL.en.md
- INSTALL.fr.md 0 additions, 0 deletionsINSTALL.fr.md
- VERSIONS 90 additions, 4 deletionsVERSIONS
- amber/afi/js/AFI-OPAC.deploy.js 8 additions, 5 deletionsamber/afi/js/AFI-OPAC.deploy.js
- amber/afi/js/AFI-OPAC.js 10 additions, 7 deletionsamber/afi/js/AFI-OPAC.js
- amber/afi/st/AFI-OPAC.st 6 additions, 6 deletionsamber/afi/st/AFI-OPAC.st
- amber/src/js/amber.js 1 addition, 0 deletionsamber/src/js/amber.js
- amber/src/js/lib/CodeMirror/codemirror.css 242 additions, 106 deletionsamber/src/js/lib/CodeMirror/codemirror.css
- amber/src/js/lib/CodeMirror/codemirror.js 7202 additions, 2514 deletionsamber/src/js/lib/CodeMirror/codemirror.js
- amber/src/js/lib/CodeMirror/css.js 717 additions, 0 deletionsamber/src/js/lib/CodeMirror/css.js
- application/modules/admin/controllers/AccueilController.php 14 additions, 15 deletionsapplication/modules/admin/controllers/AccueilController.php
- application/modules/admin/controllers/CmsController.php 23 additions, 16 deletionsapplication/modules/admin/controllers/CmsController.php
- application/modules/admin/controllers/IndexController.php 7 additions, 5 deletionsapplication/modules/admin/controllers/IndexController.php
- application/modules/admin/controllers/ProfilController.php 16 additions, 17 deletionsapplication/modules/admin/controllers/ProfilController.php
- application/modules/admin/views/scripts/accueil/calendrier.phtml 205 additions, 182 deletions...tion/modules/admin/views/scripts/accueil/calendrier.phtml
- application/modules/admin/views/scripts/index/adminvar.phtml 6 additions, 5 deletionsapplication/modules/admin/views/scripts/index/adminvar.phtml
- application/modules/admin/views/scripts/index/adminvaredit.phtml 2 additions, 2 deletions...tion/modules/admin/views/scripts/index/adminvaredit.phtml
- application/modules/opac/controllers/AbonneController.php 14 additions, 7 deletionsapplication/modules/opac/controllers/AbonneController.php
Please register or sign in to comment