Commit Graph

222 Commits

Author SHA1 Message Date
Jerome Morjon 531d3b0015 maj le css level puzzle 2015-03-20 19:33:16 +01:00
alexandre-pereira 89526701f8 d
f
2015-03-20 19:28:48 +01:00
alexandre-pereira 82dd6852b4 x
x
2015-03-20 19:22:13 +01:00
alexandre-pereira 1acf4d70a2 g 2015-03-20 18:51:04 +01:00
alexandre-pereira 52c964e07e test
tset
2015-03-20 18:38:53 +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
DonRenando 2fdcf42f29 return 2015-03-19 21:05:59 +01:00
sidya82 949442ffbc favicon de bg 2015-03-19 13:22:40 +01:00
DonRenando d9bff1ab37 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-19 12:49:59 +01:00
DonRenando ab528337e2 http 2015-03-19 12:49:11 +01:00
Jerome Morjon 06b6e83f43 maj css bouton retour 2015-03-18 21:57:05 +01:00
alexandre-pereira 4570db86fe You are not my master 2015-03-18 19:47:36 +01:00
DonRenando d8065fa6f7 voice 2015-03-18 16:50:41 +01:00
alexandre-pereira 90ba3ac6af Bip 2015-03-18 15:24:25 +01:00
alexandre-pereira fbc2f29893 ccsqd 2015-03-18 12:13:56 +01:00
alexandre-pereira f196d93ddc test 2015-03-18 12:09:00 +01:00
alexandre-pereira 91b4183afe sqs 2015-03-18 12:03:11 +01:00
alexandre-pereira b171157577 sq 2015-03-18 12:01:48 +01:00
alexandre-pereira 8dcc168458 qsxqs 2015-03-18 12:00:00 +01:00
alexandre-pereira f47579d2f3 Bugfix click prolongé 2015-03-18 11:50:14 +01:00
alexandre-pereira 08bc1a56e5 wOOP 2015-03-18 11:44:19 +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 f03f88be79 memo 2015-03-17 18:52:25 +01:00
alexandre-pereira ce899d81c1 booumm 2015-03-17 17:21:37 +01:00
alexandre-pereira 6837dbcc12 modif 2015-03-17 12:23:50 +01:00
DonRenando eb3c3eb88a modif memory 2015-03-17 12:23:24 +01:00
alexandre-pereira 150a402c85 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-17 12:08:30 +01:00
sidya82 a9ea117938 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-17 12:09:17 +01:00
sidya82 4984965d0f modifié : SRC/resources/views/backend/ref_home.blade.php 2015-03-17 12:08: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
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 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 dff658cd8e css 2015-03-16 18:22:02 +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