Malibu
|
c17ced607b
|
modified: app/Http/routes.php
|
2015-03-20 18:47:12 +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 |
|
Jerome Morjon
|
17a55015db
|
maj bg
|
2015-03-18 21:14:38 +01:00 |
|
alexandre-pereira
|
4570db86fe
|
You are not my master
|
2015-03-18 19:47:36 +01:00 |
|
DonRenando
|
827fc50875
|
this is the last voice2 !
|
2015-03-18 17:13:21 +01:00 |
|
DonRenando
|
e8a87e2705
|
this is the last voice !
|
2015-03-18 17:05:17 +01:00 |
|
DonRenando
|
8a362fbd13
|
this is the voice 2 !
|
2015-03-18 17:03:53 +01:00 |
|
DonRenando
|
daf6b760d6
|
this is the voice !
|
2015-03-18 17:01:09 +01:00 |
|
DonRenando
|
649f1cdba7
|
voice2
|
2015-03-18 16:54:00 +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 |
|
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 |
|
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 |
www
|
5a3ff22564
|
image2
|
2015-03-18 10:02:56 +01:00 |
|
www
|
003751923b
|
image
|
2015-03-18 09:54:08 +01:00 |
|
sidya82
|
53bbbbdfb3
|
Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb
|
2015-03-18 09:44:41 +01:00 |
|
sidya82
|
2666ec7af4
|
lol
|
2015-03-18 09:44:22 +01:00 |
|
DonRenando
|
a1e1e5e6d8
|
modif
|
2015-03-18 09:38:08 +01:00 |
|
alexandre-pereira
|
54751614c8
|
test
|
2015-03-18 09:23:03 +01:00 |
|
DonRenando
|
23beae3761
|
modif taille image
|
2015-03-18 09:19:04 +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 |
|
DonRenando
|
b8a1a2ae66
|
firework memory
|
2015-03-18 08:57:10 +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
|
1e484e8a8e
|
memory2
|
2015-03-17 19:00:07 +01:00 |
|
DonRenando
|
61e1ed412e
|
memory
|
2015-03-17 18:56:22 +01:00 |
|
DonRenando
|
f03f88be79
|
memo
|
2015-03-17 18:52:25 +01:00 |
|
alexandre-pereira
|
e2b3b2ce45
|
dsqd
|
2015-03-17 17:22:11 +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
|
330327af2a
|
Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb
|
2015-03-17 12:24:05 +01:00 |
|
DonRenando
|
eb3c3eb88a
|
modif memory
|
2015-03-17 12:23:24 +01:00 |
|
Jerome Morjon
|
eb8adbd319
|
ferfer
|
2015-03-17 12:23:05 +01:00 |
|
Jerome Morjon
|
702d6eac8e
|
new bg
|
2015-03-17 12:20:14 +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
|
150a402c85
|
Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb
|
2015-03-17 12:08:30 +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
|
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 |
|
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 |
|
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 |
|
Malibu
|
fa57fa3734
|
modified: SRC/resources/views/admin.blade.php
|
2015-03-10 14:34:05 +01:00 |
|
DonRenando
|
853ee062d9
|
modif button et css memory2
|
2015-03-09 22:22:43 +01:00 |
|
DonRenando
|
3ea7f8ae6e
|
modif button et css memory
|
2015-03-09 21:35:52 +01:00 |
|
Malibu
|
c9c0e2e592
|
Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb
|
2015-03-09 18:36:38 +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 |
|
DonRenando
|
e0d6100592
|
css js et responsive memory
|
2015-03-09 18:10:03 +01:00 |
|
Malibu
|
7290e0696f
|
modified: SRC/resources/views/referent.blade.php
|
2015-03-09 17:42:18 +01:00 |
|
DonRenando
|
dab277401e
|
modif css memory
|
2015-03-09 14:48:35 +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 |
|
DonRenando
|
3cc136c184
|
css suite memory 3
|
2015-03-07 01:41:43 +01:00 |
|
DonRenando
|
957973fd28
|
css suite memory button
|
2015-03-07 01:38:42 +01:00 |
|
DonRenando
|
c6ae337eca
|
css suite memory
|
2015-03-07 01:25:55 +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
|
ab7413332a
|
correction taille img home ref
|
2015-03-05 20:41:36 +01:00 |
|
sidya82
|
c8af84859d
|
Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb
|
2015-03-05 20:30:53 +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 |
|
sidya82
|
0478664d2a
|
modifié : SRC/resources/views/emails/password.blade.php
|
2015-03-05 20:30:21 +01:00 |
|
sidya82
|
b655411c09
|
modifié : SRC/resources/views/emails/password.blade.php
|
2015-03-05 20:28:28 +01:00 |
|
sidya82
|
d31dab13eb
|
modifié : SRC/resources/views/emails/password.blade.php
|
2015-03-05 20:27:02 +01:00 |
|
sidya82
|
da0afe0582
|
modifié : SRC/app/Http/Controllers/AdminController.php
|
2015-03-05 20:21:03 +01:00 |
|
sidya82
|
2d2fdb3fd0
|
modifié : SRC/app/Http/Controllers/AdminController.php
|
2015-03-05 20:19:13 +01:00 |
|
sidya82
|
81f0d5de73
|
modifié : SRC/app/Http/Controllers/AdminController.php
|
2015-03-05 20:17:10 +01:00 |
|
www
|
f7b99d84c9
|
alaa
|
2015-03-05 19:27:08 +01:00 |
|
Malibu
|
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 |
|
Malibu
|
49c5b2b1d1
|
modified: SRC/resources/views/navbar_signed.blade.php
|
2015-03-05 18:39:42 +01:00 |
|
Malibu
|
190e27f501
|
modified: SRC/resources/views/navbar_signed.blade.php
|
2015-03-05 18:38:27 +01:00 |
|
Malibu
|
48ae78a799
|
modified: SRC/resources/views/navbar_signed.blade.php
|
2015-03-05 18:37:05 +01:00 |
|
DonRenando
|
279ffdcae1
|
mise en place jeu memory mais pas fini
|
2015-03-05 18:03:46 +01:00 |
|
Malibu
|
91089b72f7
|
modified: SRC/public/js/ListeOeuvre.js
|
2015-03-05 11:32:08 +01:00 |
|
Malibu
|
84dcddb48d
|
modified: SRC/public/js/ListeOeuvre.js
|
2015-03-04 22:43:27 +01:00 |
|
Malibu
|
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 |
|
Malibu
|
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 |
|
sidya82
|
85440932a6
|
modified: SRC/public/js/ListeOeuvre.js
|
2015-03-03 18:02:56 +01:00 |
|
sidya82
|
e685a8e104
|
modified: SRC/public/js/ListeOeuvre.js
|
2015-03-03 18:00:22 +01:00 |
|
sidya82
|
e9c42760c8
|
modified: SRC/resources/views/referent.blade.php
|
2015-03-03 17:55:45 +01:00 |