Commit Graph

88 Commits

Author SHA1 Message Date
Malibu ead9c26d4d modified: app/Http/Controllers/GameController.php 2015-03-20 18:37:42 +01:00
alexandre-pereira df7f8fc05a commit 2015-03-20 15:48:08 +01:00
alexandre-pereira 4570db86fe You are not my master 2015-03-18 19:47:36 +01:00
alexandre-pereira 90ba3ac6af Bip 2015-03-18 15:24:25 +01:00
alexandre-pereira 08bc1a56e5 wOOP 2015-03-18 11:44:19 +01:00
www 5a3ff22564 image2 2015-03-18 10:02:56 +01:00
alexandre-pereira efc37a61f8 bouh! 2015-03-17 19:35:59 +01:00
alexandre-pereira fd46a5720c Quelques modifs 2015-03-17 19:35:58 +01:00
DonRenando 61e1ed412e memory 2015-03-17 18:56:22 +01:00
alexandre-pereira ce899d81c1 booumm 2015-03-17 17:21:37 +01:00
alexandre-pereira aba3ac1c22 Merge remote-tracking branch 'origin/master'
Conflicts:
	SRC/public/css/frontend.css
2015-03-17 12:07:59 +01:00
alexandre-pereira 2991405b30 commit 2015-03-17 12:07:18 +01:00
Jerome Morjon b8841516d6 add icon info 2015-03-17 11:57:53 +01:00
Jerome Morjon 06b7bc9a66 add icon 2015-03-17 11:47:48 +01:00
Jerome Morjon 40dae8987b maj loupe dans la barre de rech + titre home 2015-03-17 11:40:24 +01:00
alexandre-pereira ca50de606d tset 2015-03-17 10:54:31 +01:00
alexandre-pereira 26b71fa2b9 boum 2015-03-16 23:23:41 +01:00
alexandre-pereira 7b771725b3 commit 2015-03-16 19:49:16 +01:00
Jerome Morjon 8ec8fb4485 maj icon et page game 2015-03-16 19:48:00 +01:00
DonRenando dff658cd8e css 2015-03-16 18:22:02 +01:00
DonRenando 1ccdae5f95 modif css 2015-03-16 17:05:50 +01:00
Jerome Morjon 12b4b140d8 refonte page game 2015-03-16 16:44:32 +01:00
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 6ea2de6e26 Ajout <select multiple> dropdown 2015-03-14 18:20:35 +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 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
DonRenando 12a0a618a6 retour ligne et centre memory 2015-03-10 15:50:25 +01:00
DonRenando f0fcd0da22 retour ligne et centre memory 2015-03-10 15:09:33 +01:00
DonRenando 1bc1f7f3e3 modif css memory 2015-03-10 14:38:52 +01:00
DonRenando 853ee062d9 modif button et css memory2 2015-03-09 22:22:43 +01:00
DonRenando e0d6100592 css js et responsive memory 2015-03-09 18:10:03 +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
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 a895bb66ee maj css et icon 2015-03-06 10:51:13 +01:00
Jerome Morjon 9d66bf0b91 correction bouton add referent dans admin 2015-03-05 21:17:56 +01:00
Jerome Morjon 67279e8265 fixation du bug affichage bouton retour sur Login 2015-03-05 21:12:34 +01:00
Jerome Morjon d696bdb4b7 re correction 2015-03-05 20:42:23 +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
www f7b99d84c9 alaa 2015-03-05 19:27:08 +01:00
DonRenando 279ffdcae1 mise en place jeu memory mais pas fini 2015-03-05 18:03:46 +01:00
Malibu fe111c9661 blabla 2015-03-03 15:35:21 +01:00
Jerome Morjon 233303e7b2 remis 2015-03-02 11:19:22 +01:00
Malibu 386ba3fac0 modified: SRC/public/css/referent.css
modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
2015-02-27 15:28:42 +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