14 Dec, 2018

4 commits


13 Dec, 2018

2 commits


24 Aug, 2018

2 commits


22 Aug, 2018

4 commits

  • Conflicts:
    	src/Controller/AppController.php
    	src/Controller/DocumentsController.php
    	src/Model/Table/DocumentsTable.php
    	src/Template/Documents/edit.ctp
    	src/Template/Layout/Formules/add.ctp
    	src/Template/Layout/Formules/edit.ctp
    	src/Template/Layout/Formules/index.ctp
    	src/Template/Layout/Formules/view.ctp
    	src/Template/Materiels/index.ctp
    	src/Template/Pages/tools_menu_sm.ctp
    	src/Template/Suivis/add.ctp
    	src/Template/Suivis/view.ctp
    mimelhaine
     
  • MI
    mimelhaine
     
  • mimelhaine
     
  • Merge branch 'dev' of https://gitlab.irap.omp.eu/epallier/labinvent.git
    into dev
    
    Conflicts:
    	src/Controller/AppController.php
    	src/Controller/DocumentsController.php
    	src/Model/Table/DocumentsTable.php
    	src/Template/Documents/edit.ctp
    	src/Template/Materiels/add.ctp
    	src/Template/Materiels/index.ctp
    	src/Template/Pages/tools_menu_sm.ctp
    	src/Template/Suivis/view.ctp
    	webroot/js/script.js
    mimelhaine
     

21 Aug, 2018

3 commits


14 Aug, 2018

16 commits


13 Aug, 2018

2 commits


08 Aug, 2018

4 commits


06 Aug, 2018

1 commit


01 Aug, 2018

2 commits