Commit Graph

32 Commits

Author SHA1 Message Date
Jerome Morjon 233303e7b2 remis 2015-03-02 11:19:22 +01:00
www 2fbbc8fe77 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb
Conflicts:
	SRC/app/Http/Controllers/ReferentController.php
	SRC/public/css/game.css
	SRC/public/css/home.css
	SRC/resources/views/referent.blade.php
	SRC/resources/views/referent_games.blade.php
2015-02-24 11:35:26 +01:00
www 4f8e9f9a38 bug 2015-02-24 11:34:35 +01:00
Jerome Morjon b31430469e ajout d'une icon game et suppression du texte game 2015-02-21 16:41:08 +01:00
Jerome Morjon 2a4fef10d7 test du coverflow page d'acceuil 2015-02-21 03:53:55 +01:00
Jerome Morjon c41c6af4a1 maj referent non fini 2015-02-20 02:54:06 +01:00
Jerome Morjon dd386205b8 MAJ wallp 2015-02-19 16:45:25 +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 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
Malibu fed82155dc update 2015-02-18 18:13:47 +01:00
DonRenando 2781c482c1 avatar referent 2015-02-18 17:58:11 +01:00
Malibu 1f7bc48129 fix upload_ref 2015-02-18 17:00:02 +01:00
Malibu 3425dc66d9 upload picture 2015-02-18 16:49:02 +01:00
Malibu 75548c78f2 delete user 2015-02-17 21:57:41 +01:00
Malibu 4a5dbde1c9 update navbar 2015-02-17 21:12:16 +01:00
Jerome Morjon b94a1c7cba maj de la page d'acceuil
création d’un repertoire image
maj du app.css
maj du home.blade.php
selection d’un fond d’ecran
j’ai ajouté des users dans la bdd
2015-02-16 02:41:12 +01:00
sidya82 af395a32ef identification 2015-02-15 07:12:44 +01:00
Malibu e1148d1a43 template referent 2015-02-13 00:59:13 +01:00
Malibu e28cd6d653 template login/home 2015-02-12 18:58:03 +01:00