QRouland/ModuleWeb
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
480 Commits 1 Branch 0 Tags
f53ac92a2767bba9778eabfff4e8cfa66afabebc
Commit Graph

153 Commits

Author SHA1 Message Date
Malibu
f53ac92a27 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-20 19:29:05 +01:00
Malibu
351dba5f9b hh 2015-03-20 19:28:49 +01:00
alexandre-pereira
5de7ee5a03 feefzfze 2015-03-20 19:18:24 +01:00
Malibu
ba70aad33d jj 2015-03-20 19:14:46 +01:00
Malibu
90c8c5e2bf ll 2015-03-20 19:05:01 +01:00
Malibu
c8c2687d9e jj 2015-03-20 18:59:24 +01:00
alexandre-pereira
2e1fa1acce qsdsqd 2015-03-20 18:55:56 +01:00
Malibu
c0f36287c3 jj 2015-03-20 18:54:50 +01:00
Malibu
b304722c61 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-20 18:54:08 +01:00
alexandre-pereira
1acf4d70a2 g 2015-03-20 18:51:04 +01:00
Malibu
c17ced607b modified: app/Http/routes.php 2015-03-20 18:47:12 +01:00
Malibu
554ff59064 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 
SRC/app/Http/Controllers/GameController.php
 2015-03-20 18:39:32 +01:00
Malibu
ead9c26d4d modified: app/Http/Controllers/GameController.php 2015-03-20 18:37:42 +01:00
alexandre-pereira
f1ca44ebf1 test 2015-03-20 18:13:35 +01:00
alexandre-pereira
df7f8fc05a commit 2015-03-20 15:48:08 +01:00
alexandre-pereira
90ba3ac6af Bip 2015-03-18 15:24:25 +01:00
DonRenando
4c8802f7bb image aléatoire et jeu non actif 2015-03-18 15:06:07 +01:00
DonRenando
3c8f636146 Create GameController.php 2015-03-18 14:47:15 +01:00
DonRenando
62d9df1257 test 2015-03-18 14:42:09 +01:00
sidya82
2666ec7af4 lol 2015-03-18 09:44:22 +01:00
alexandre-pereira
54751614c8 test 2015-03-18 09:23:03 +01:00
sidya82
d740e57d56 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-18 09:10:27 +01:00
sidya82
9fd3d627f8 modifié : SRC/app/Http/Controllers/ImageController.php 
modifié :         SRC/app/Http/Controllers/LoginController.php
 2015-03-18 09:09:38 +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
e2b3b2ce45 dsqd 2015-03-17 17:22:11 +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
alexandre-pereira
26b71fa2b9 boum 2015-03-16 23:23:41 +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
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
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
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