Commit Graph

119 Commits

Author SHA1 Message Date
sidya82 fddfc69616 lol sa va beugué 2015-03-16 15:35:03 +01:00
alexandre-pereira f9251c68f9 Co co mit 2015-03-16 14:07:32 +01:00
alexandre-pereira 4ef3e7e8b3 Intégration images dans Mémory 2015-03-15 19:38:11 +01:00
alexandre-pereira 0cfce7d1f9 Presque terminé 2015-03-15 02:23:26 +01:00
alexandre-pereira 6ea2de6e26 Ajout <select multiple> dropdown 2015-03-14 18:20:35 +01:00
alexandre-pereira 33ac86a89b Configuration du jeu possible + bugfixs 2015-03-14 16:11:11 +01:00
alexandre-pereira de05756a7b Refactoring Complet
Voir facebook pour l'installation de la nouvelle BDD.
2015-03-14 14:36:03 +01:00
alexandre-pereira 26fd8c5f98 user correct 2015-03-10 16:12:11 +01:00
Malibu 5c05abf8b7 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-10 16:11:17 +01:00
Malibu b9202d2070 modified: SRC/app/Http/Controllers/GameController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/app/Models/User.php
2015-03-10 16:10:52 +01:00
alexandre-pereira cf77d9a484 user correct 2015-03-10 16:09:28 +01:00
alexandre-pereira e87cf67a71 Merge remote-tracking branch 'origin/master'
Conflicts:
	SRC/resources/views/home.blade.php
2015-03-10 16:00:02 +01:00
alexandre-pereira df57f8f539 new main page 2015-03-10 15:57:41 +01:00
Malibu 54b701eeed modified: SRC/app/Http/Controllers/GameController.php
modified:   SRC/app/Models/ListeOeuvre.php
	modified:   SRC/resources/views/home.blade.php
	modified:   SRC/resources/views/referent_games.blade.php
2015-03-10 15:27:36 +01:00
Malibu 26a0828f26 modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-03-09 18:36:03 +01:00
sidya82 da0afe0582 modifié : SRC/app/Http/Controllers/AdminController.php 2015-03-05 20:21:03 +01:00
sidya82 2d2fdb3fd0 modifié : SRC/app/Http/Controllers/AdminController.php 2015-03-05 20:19:13 +01:00
sidya82 81f0d5de73 modifié : SRC/app/Http/Controllers/AdminController.php 2015-03-05 20:17:10 +01:00
Malibu 3613ef325f modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-03-05 19:17:18 +01:00
Malibu 652d5dba9a modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-03-04 22:24:42 +01:00
Malibu 880652df04 modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-03-04 19:36:23 +01:00
Malibu 198ca6f5dc blabla 2015-03-03 15:41:28 +01:00
DonRenando d26773dfd9 modification ville en ecole 2.0 2015-03-03 13:53:41 +01:00
DonRenando c8a967dece modification ville en ecole 2015-03-03 13:49:53 +01:00
Malibu 8568cbe04e Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-02 12:22:04 +01:00
Malibu 07a3dd235f bla 2015-03-02 12:21:42 +01:00
Jerome Morjon 233303e7b2 remis 2015-03-02 11:19:22 +01:00
Malibu f85f705eae modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/resources/views/referent.blade.php
2015-02-26 15:36:01 +01:00
Malibu 9edc7af7d3 modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-02-26 15:07:34 +01:00
Malibu 439888f0db modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-02-26 12:04:25 +01:00
Malibu 485f0019f0 ff 2015-02-25 19:48:34 +01:00
Malibu 95ff2cadcf fix bug 2015-02-24 12:06:24 +01:00
Malibu d661ecb9f8 new file: SRC/app/Http/Controllers/ReferentController.php 2015-02-24 11:50:17 +01:00
www 3d2d69cf26 bug 2015-02-24 11:50:00 +01:00
www 7a427b2b4e Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-24 11:46:58 +01:00
Malibu 0b48ebc872 modified: SRC/app/Http/Controllers/ReferentController.php 2015-02-24 11:45:24 +01:00
www cd11f29a18 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-24 11:41:19 +01:00
Malibu ed12c2cc6b modified: SRC/app/Http/Controllers/ReferentController.php 2015-02-24 11:39:59 +01:00
www 52cae36ce6 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-24 11:36:54 +01:00
Malibu c2bef25f88 modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/public/js/ListeOeuvre.js
2015-02-24 11:35:26 +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
Malibu 407a955444 modified: SRC/app/Http/routes.php
modified:   SRC/public/js/ListeOeuvre.js
2015-02-23 19:40:01 +01:00
Malibu 8a0f8a5b3c modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-02-23 19:35:01 +01:00
Malibu 695adc5d3a modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-02-23 14:18:18 +01:00
Malibu f6027554fe modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/app/Models/Oeuvre.php
2015-02-23 12:23:01 +01:00
Malibu d9cc1e2a4c modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/app/Models/Oeuvre.php
	modified:   SRC/resources/views/referent.blade.php
2015-02-22 16:42:45 +01:00
Malibu 4c061c4d73 modified: SRC/app/Http/Controllers/ReferentController.php 2015-02-20 18:37:58 +01:00
Malibu a17832b4b6 modified: SRC/app/Http/Controllers/ReferentController.php
modified:   SRC/resources/views/referent.blade.php
2015-02-20 18:29:57 +01:00
Malibu 5fbb41a461 move models & view referent 2015-02-20 15:00:09 +01:00