216 Commits

Author SHA1 Message Date
Jerome Morjon
167854e785 maj vue ref
ajout du switch des oeuvres + fix button
2015-02-20 01:28:03 +01:00
Jerome Morjon
4c8e483b99 fix button size bug 2015-02-20 01:09:05 +01:00
Jerome Morjon
b32d8b5167 switch inséré 2015-02-20 00:58:51 +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
4fac5f8726 modifié : SRC/public/js/ListeOeuvre.js 2015-02-19 18:44:40 +01:00
sidya82
127f3dad65 modifié : SRC/public/js/ListeOeuvre.js 2015-02-19 18:21:04 +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
fcb8a0a8fa maj css ref 2015-02-19 18:00:00 +01:00
Jerome Morjon
07095f6ac6 maj css ref 2015-02-19 18:00:00 +01:00
sidya82
5146b2f6af nouveau fichier : SRC/public/js/setListeOeuvre.js 2015-02-19 17:36:39 +01:00
sidya82
2a18c47789 modifié : SRC/app/Http/Controllers/ReferentController.php
modifié :         SRC/app/Http/routes.php
	modifié :         SRC/public/js/getListeOeuvre.js
2015-02-19 17:35:57 +01:00
Jerome Morjon
d92ce6372d css ref 2015-02-19 17:29:04 +01:00
Malibu
70469b1e12 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-19 17:08:03 +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
4059881efd maj taille img 2015-02-19 16:56:05 +01:00
sidya82
465098a463 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-19 16:51:20 +01:00
sidya82
d41fdb2815 modifié : SRC/app/Http/Controllers/ReferentController.php
modifié :         SRC/public/js/getListeOeuvre.js
2015-02-19 16:50:36 +01:00
Jerome Morjon
400022380c maj home 2015-02-19 16:50:00 +01:00
Jerome Morjon
dd386205b8 MAJ wallp 2015-02-19 16:45:25 +01:00
Malibu
d22f90d8ce blabla 2015-02-19 15:37:52 +01:00
DonRenando
dbf284c117 erreur2 2015-02-18 23:16:41 +01:00
DonRenando
8cc9176450 curseur2 2015-02-18 23:12:37 +01:00
DonRenando
357d903bb5 curseur 2015-02-18 23:03:16 +01:00
DonRenando
4cbb358f48 CSS4 2015-02-18 22:49:48 +01:00
DonRenando
278fa55ed8 CSS3 2015-02-18 22:17:31 +01:00
DonRenando
416ddb7a16 CSS2 2015-02-18 21:15:20 +01:00
DonRenando
c8c4e3b9c6 CSS 2015-02-18 19:52:26 +01:00
Malibu
e674d9ef88 ll 2015-02-18 19:18:15 +01:00
Malibu
2cdcfb3b01 add folder picture 2015-02-18 19:16:30 +01:00
www
846ef181b1 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 19:12:25 +01:00
www
06c3795823 tt 2015-02-18 19:12:05 +01:00
Malibu
cd05e345e5 blabla 2015-02-18 19:04:49 +01:00
Malibu
2f0ad27af9 blabla 2015-02-18 18:59:02 +01:00
matthieupenchenat81
d4c519a357 Delete 5 2015-02-18 18:54:58 +01:00
matthieupenchenat81
31f0415ea1 Delete 3 2015-02-18 18:54:51 +01:00
matthieupenchenat81
b94e5f2b29 Delete 2 2015-02-18 18:54:45 +01:00
matthieupenchenat81
06fb78e8e8 Delete 1 2015-02-18 18:54:37 +01:00
www
dc25fec393 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:54:33 +01:00
Malibu
5c2b07d715 modified: SRC/public/css/app.css
modified:   SRC/resources/views/home.blade.php
2015-02-18 18:51:07 +01:00
www
9e9323ab83 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:43:03 +01:00
Malibu
531a337208 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:42:41 +01:00
DonRenando
21c28b0ad6 rechercher 2015-02-18 18:42:00 +01:00
Malibu
6dc2dd41a1 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:41:09 +01:00
Malibu
99b3bff06d fix upload in User model 2015-02-18 18:40:00 +01:00
www
4563ddfa54 lol 2015-02-18 18:32:12 +01:00
DonRenando
fe922c47b0 taille max 2015-02-18 18:27:58 +01:00