Commit Graph

168 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 4135ae7317 Il est tout comme Mite' ! 2015-03-14 17:48:57 +01:00
alexandre-pereira 33ac86a89b Configuration du jeu possible + bugfixs 2015-03-14 16:11:11 +01:00
alexandre-pereira 4c61d4faa8 test
zez
2015-03-14 14:41:27 +01:00
alexandre-pereira de05756a7b Refactoring Complet
Voir facebook pour l'installation de la nouvelle BDD.
2015-03-14 14:36:03 +01:00
Malibu 0205f4c864 modified: SRC/resources/views/app.blade.php 2015-03-10 16:43:18 +01:00
Malibu 4342d293d3 modified: SRC/resources/views/app.blade.php
deleted:    SRC/resources/views/home.blade#OnDisk.php
2015-03-10 16:38:21 +01:00
Malibu 2fbcad0ba3 update 2015-03-10 16:33:48 +01:00
alexandre-pereira 5a161de43a azea 2015-03-10 16:16:00 +01:00
alexandre-pereira bc538b0c27 test 2015-03-10 16:14:59 +01:00
alexandre-pereira ab69d09f94 r 2015-03-10 16:14:04 +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 fa57fa3734 modified: SRC/resources/views/admin.blade.php 2015-03-10 14:34:05 +01:00
DonRenando 853ee062d9 modif button et css memory2 2015-03-09 22:22:43 +01:00
Malibu c9c0e2e592 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-09 18:36:38 +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
DonRenando e0d6100592 css js et responsive memory 2015-03-09 18:10:03 +01:00
Malibu 7290e0696f modified: SRC/resources/views/referent.blade.php 2015-03-09 17:42:18 +01:00
DonRenando dab277401e modif css memory 2015-03-09 14:48:35 +01:00
Jerome Morjon 544a9d5473 maj css home + new js 2015-03-09 15:13:03 +01:00
DonRenando 6ffe9e1f78 responsive css js memory 2 2015-03-08 16:02:07 +01:00
DonRenando b62e47b1a1 responsive css js memory 2015-03-07 23:59:57 +01:00
DonRenando f237daf600 MAJ css js memory 2015-03-07 17:38:06 +01:00
DonRenando c6ae337eca css suite memory 2015-03-07 01:25:55 +01:00
Jerome Morjon d319cb7ba2 Correction des alt img sur home + correction page ref
fichier ref idem sur serveur
2015-03-06 22:10:54 +01:00
Jerome Morjon 67279e8265 fixation du bug affichage bouton retour sur Login 2015-03-05 21:12:34 +01:00
Jerome Morjon ab7413332a correction taille img home ref 2015-03-05 20:41:36 +01:00
sidya82 c8af84859d Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-05 20:30:53 +01:00
Jerome Morjon bb752a2e98 correction des bugs css sur home + ajout img game
Correction du bug de la page home de:
-icon loupe
-champs recherche
-fond d’image ref
-correction position indicateur
-correction fond du nom du prof
2015-03-05 20:30:22 +01:00
sidya82 0478664d2a modifié : SRC/resources/views/emails/password.blade.php 2015-03-05 20:30:21 +01:00
sidya82 b655411c09 modifié : SRC/resources/views/emails/password.blade.php 2015-03-05 20:28:28 +01:00
sidya82 d31dab13eb modifié : SRC/resources/views/emails/password.blade.php 2015-03-05 20:27:02 +01:00
www f7b99d84c9 alaa 2015-03-05 19:27:08 +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 49c5b2b1d1 modified: SRC/resources/views/navbar_signed.blade.php 2015-03-05 18:39:42 +01:00
Malibu 190e27f501 modified: SRC/resources/views/navbar_signed.blade.php 2015-03-05 18:38:27 +01:00
Malibu 48ae78a799 modified: SRC/resources/views/navbar_signed.blade.php 2015-03-05 18:37:05 +01:00
DonRenando 279ffdcae1 mise en place jeu memory mais pas fini 2015-03-05 18:03:46 +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
sidya82 e9c42760c8 modified: SRC/resources/views/referent.blade.php 2015-03-03 17:55:45 +01:00
sidya82 2e32045c5d modified: SRC/resources/views/referent.blade.php 2015-03-03 17:49:18 +01:00
sidya82 e38f7d5737 modified: SRC/public/js/ListeOeuvre.js
modified:   SRC/resources/views/referent.blade.php
2015-03-03 17:47:08 +01:00
Malibu b0d3f8f725 blabla 2015-03-03 15:45:00 +01:00