Commit Graph

172 Commits

Author SHA1 Message Date
www
4d24af0134 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-16 15:54:44 +01:00
www
c0af5371a6 modified: SRC/resources/views/auth/reset.blade.php 2015-03-16 15:53:46 +01:00
www
2b1529105b modified: SRC/app/Http/Controllers/LoginController.php
modified:   SRC/app/Http/routes.php
	modified:   SRC/resources/views/auth/register.blade.php
	modified:   SRC/resources/views/auth/reset.blade.php
2015-03-16 15:40:12 +01:00
3a526c2d0a commit 2015-03-16 15:39:49 +01:00
fddfc69616 lol sa va beugué 2015-03-16 15:35:03 +01:00
f9251c68f9 Co co mit 2015-03-16 14:07:32 +01:00
4ef3e7e8b3 Intégration images dans Mémory 2015-03-15 19:38:11 +01:00
0cfce7d1f9 Presque terminé 2015-03-15 02:23:26 +01:00
6ea2de6e26 Ajout <select multiple> dropdown 2015-03-14 18:20:35 +01:00
4135ae7317 Il est tout comme Mite' ! 2015-03-14 17:48:57 +01:00
33ac86a89b Configuration du jeu possible + bugfixs 2015-03-14 16:11:11 +01:00
4c61d4faa8 test
zez
2015-03-14 14:41:27 +01:00
de05756a7b Refactoring Complet
Voir facebook pour l'installation de la nouvelle BDD.
2015-03-14 14:36:03 +01:00
0205f4c864 modified: SRC/resources/views/app.blade.php 2015-03-10 16:43:18 +01:00
4342d293d3 modified: SRC/resources/views/app.blade.php
deleted:    SRC/resources/views/home.blade#OnDisk.php
2015-03-10 16:38:21 +01:00
2fbcad0ba3 update 2015-03-10 16:33:48 +01:00
5a161de43a azea 2015-03-10 16:16:00 +01:00
bc538b0c27 test 2015-03-10 16:14:59 +01:00
ab69d09f94 r 2015-03-10 16:14:04 +01:00
e87cf67a71 Merge remote-tracking branch 'origin/master'
Conflicts:
	SRC/resources/views/home.blade.php
2015-03-10 16:00:02 +01:00
df57f8f539 new main page 2015-03-10 15:57:41 +01:00
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
fa57fa3734 modified: SRC/resources/views/admin.blade.php 2015-03-10 14:34:05 +01:00
853ee062d9 modif button et css memory2 2015-03-09 22:22:43 +01:00
c9c0e2e592 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-09 18:36:38 +01:00
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
e0d6100592 css js et responsive memory 2015-03-09 18:10:03 +01:00
7290e0696f modified: SRC/resources/views/referent.blade.php 2015-03-09 17:42:18 +01:00
dab277401e modif css memory 2015-03-09 14:48:35 +01:00
544a9d5473 maj css home + new js 2015-03-09 15:13:03 +01:00
6ffe9e1f78 responsive css js memory 2 2015-03-08 16:02:07 +01:00
b62e47b1a1 responsive css js memory 2015-03-07 23:59:57 +01:00
f237daf600 MAJ css js memory 2015-03-07 17:38:06 +01:00
c6ae337eca css suite memory 2015-03-07 01:25:55 +01:00
d319cb7ba2 Correction des alt img sur home + correction page ref
fichier ref idem sur serveur
2015-03-06 22:10:54 +01:00
67279e8265 fixation du bug affichage bouton retour sur Login 2015-03-05 21:12:34 +01:00
ab7413332a correction taille img home ref 2015-03-05 20:41:36 +01:00
c8af84859d Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-05 20:30:53 +01:00
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
0478664d2a modifié : SRC/resources/views/emails/password.blade.php 2015-03-05 20:30:21 +01:00
b655411c09 modifié : SRC/resources/views/emails/password.blade.php 2015-03-05 20:28:28 +01:00
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
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
49c5b2b1d1 modified: SRC/resources/views/navbar_signed.blade.php 2015-03-05 18:39:42 +01:00
190e27f501 modified: SRC/resources/views/navbar_signed.blade.php 2015-03-05 18:38:27 +01:00
48ae78a799 modified: SRC/resources/views/navbar_signed.blade.php 2015-03-05 18:37:05 +01:00
279ffdcae1 mise en place jeu memory mais pas fini 2015-03-05 18:03:46 +01:00
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
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