Commit Graph

26 Commits

Author SHA1 Message Date
Malibu 00d0ef2684 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-19 23:06:53 +01:00
Malibu e7c0dbc238 jj 2015-02-19 23:06:04 +01:00
Jerome Morjon 6b88d2c9cd Merge remote-tracking branch 'origin/master'
Conflicts:
	SRC/public/css/referent.css
	SRC/resources/views/referent.blade.php
2015-02-19 23:02:35 +01:00
Jerome Morjon d80d18f9f0 maj css et button app.css 2015-02-19 23:02:06 +01:00
Malibu dd4f2c8241 m 2015-02-19 22:53:52 +01:00
sidya82 1ecdc1b3ff modifié : SRC/app/Http/Controllers/ReferentController.php
modifié :         SRC/public/js/ListeOeuvre.js
	modifié :         SRC/resources/views/referent.blade.php
2015-02-19 19:20:13 +01:00
sidya82 2031282c06 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-19 18:13:46 +01:00
sidya82 634914e582 modifié : SRC/app/Http/Controllers/ReferentController.php
modifié :         SRC/app/Http/routes.php
	renommé :         SRC/public/js/getListeOeuvre.js -> SRC/public/js/ListeOeuvre.js
	supprimé :        SRC/public/js/setListeOeuvre.js
	modifié :         SRC/resources/views/app.blade.php
	modifié :         SRC/resources/views/referent.blade.php
2015-02-19 18:11:51 +01:00
Jerome Morjon 07095f6ac6 maj css ref 2015-02-19 18:00:00 +01:00
Malibu 71800eebbe modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/resources/views/referent.blade.php
	new file:   SRC/resources/views/referent.blade_old.php
2015-02-19 17:55:46 +01:00
Jerome Morjon d92ce6372d css ref 2015-02-19 17:29:04 +01:00
Malibu 192605eaf1 modified: SRC/resources/views/referent.blade.php 2015-02-19 17:13:24 +01:00
Malibu f689ecef97 modified: SRC/public/js/getListeOeuvre.js
modified:   SRC/resources/views/home.blade.php
	modified:   SRC/resources/views/referent.blade.php
2015-02-19 17:07:41 +01:00
Jerome Morjon dd386205b8 MAJ wallp 2015-02-19 16:45:25 +01:00
Malibu 94a2348737 modified: SRC/resources/views/referent.blade.php 2015-02-19 16:42:27 +01:00
Malibu 415fdb2812 modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/resources/views/referent.blade.php
2015-02-19 16:22:12 +01:00
Malibu d22f90d8ce blabla 2015-02-19 15:37:52 +01:00
Malibu 76ddc88b20 modified: SRC/resources/views/referent.blade.php 2015-02-19 01:07:33 +01:00
Malibu 5ecdc37d36 modified: SRC/resources/views/referent.blade.php 2015-02-19 01:06:29 +01:00
Malibu c0feb36014 modified: app/Http/Controllers/ReferentController.php
modified:   app/ListeOeuvre.php
	modified:   app/Oeuvre.php
	modified:   resources/views/referent.blade.php
2015-02-19 00:15:29 +01:00
Malibu 51fd0b06b9 database update 2015-02-18 23:15:18 +01:00
sidya82 af395a32ef identification 2015-02-15 07:12:44 +01:00
Malibu 991af05838 Fix Doctype with navbar 2015-02-15 01:05:39 +01:00
Malibu eb28b20e4e navbar in admin 2015-02-13 11:41:05 +01:00
Malibu e1148d1a43 template referent 2015-02-13 00:59:13 +01:00
Malibu ba61a1b427 states 2015-02-12 20:00:23 +01:00