547 Commits

Author SHA1 Message Date
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
sidya82
661ac601fb Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-17 11:55:51 +01:00
sidya82
091c3cbdd7 nouveau fichier : SRC/app/Http/Controllers/ImageController.php
modifié :         SRC/app/Http/routes.php
	modifié :         SRC/composer.json
	modifié :         SRC/composer.lock
	modifié :         SRC/config/app.php
	modifié :         SRC/resources/views/backend/ref_listeoeuvres.blade.php
2015-03-17 11:55:12 +01:00
Jerome Morjon
06b7bc9a66 add icon 2015-03-17 11:47:48 +01:00
matthieupenchenat81
a60189304e Update password.blade.php 2015-03-17 11:47:41 +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
ff581ca35d test 2015-03-16 23:59:59 +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
33f8be4a19 modif css 2015-03-16 19:01:25 +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
alexandre-pereira
5e019357fe correction thumbnail 2015-03-16 16:43:35 +01:00
Jerome Morjon
12b4b140d8 refonte page game 2015-03-16 16:44:32 +01:00
DonRenando
4caa605783 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-16 16:01:52 +01:00
DonRenando
aa6bd3ea05 modification niveau memory 2015-03-16 16:01:24 +01:00
sidya82
9204faf4aa modifié : SRC/app/Http/Controllers/LoginController.php 2015-03-16 16:01:06 +01:00
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
alexandre-pereira
6448139c22 suppression fichier inutile, poulet svp 2015-03-16 15:51:37 +01:00
Jerome Morjon
e6bed55e07 ajout des icones fait maison 2015-03-16 15:52:06 +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
alexandre-pereira
3a526c2d0a commit 2015-03-16 15:39:49 +01:00
sidya82
fddfc69616 lol sa va beugué 2015-03-16 15:35:03 +01:00
www
b69f8c03b6 modified: SRC/config/mail.php 2015-03-16 14:20:24 +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
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
DonRenando
12a0a618a6 retour ligne et centre memory 2015-03-10 15:50:25 +01:00