QRouland
/
ModuleWeb
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
572 Commits 1 Branch 0 Tags 40 MiB
Commit Graph

275 Commits

Author SHA1 Message Date
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
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
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
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 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 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
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 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 67279e8265 fixation du bug affichage bouton retour sur Login 2015-03-05 21:12:34 +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
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 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 e9c42760c8 modified: SRC/resources/views/referent.blade.php 2015-03-03 17:55:45 +01:00
sidya82 2e32045c5d modified: SRC/resources/views/referent.blade.php 2015-03-03 17:49:18 +01:00
sidya82 e38f7d5737 modified: SRC/public/js/ListeOeuvre.js 
modified:   SRC/resources/views/referent.blade.php
 2015-03-03 17:47:08 +01:00
Malibu b0d3f8f725 blabla 2015-03-03 15:45:00 +01:00
Malibu 198ca6f5dc blabla 2015-03-03 15:41:28 +01:00
Malibu fe111c9661 blabla 2015-03-03 15:35:21 +01:00
DonRenando c8a967dece modification ville en ecole 2015-03-03 13:49:53 +01:00
Malibu 8568cbe04e Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-02 12:22:04 +01:00
Malibu 07a3dd235f bla 2015-03-02 12:21:42 +01:00
Jerome Morjon 233303e7b2 remis 2015-03-02 11:19:22 +01:00
Malibu 386ba3fac0 modified: SRC/public/css/referent.css 
modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
 2015-02-27 15:28:42 +01:00
sidya82 24a1fcad27 modifié : SRC/public/js/ListeOeuvre.js 
modifié :         SRC/resources/views/referent.blade.php
 2015-02-27 15:01:24 +01:00
Malibu f85f705eae modified: SRC/app/Http/Controllers/ReferentController.php 
modified:   SRC/resources/views/referent.blade.php
 2015-02-26 15:36:01 +01:00
Malibu 9edc7af7d3 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-02-26 15:07:34 +01:00
Malibu 439888f0db modified: SRC/app/Http/Controllers/ReferentController.php 
modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
 2015-02-26 12:04:25 +01:00
Malibu 95ff2cadcf fix bug 2015-02-24 12:06:24 +01:00
www 2fbbc8fe77 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 
Conflicts:
	SRC/app/Http/Controllers/ReferentController.php
	SRC/public/css/game.css
	SRC/public/css/home.css
	SRC/resources/views/referent.blade.php
	SRC/resources/views/referent_games.blade.php
 2015-02-24 11:35:26 +01:00
www 4f8e9f9a38 bug 2015-02-24 11:34:35 +01:00
Malibu 8a0f8a5b3c 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-02-23 19:35:01 +01:00
Malibu 695adc5d3a modified: SRC/app/Http/Controllers/ReferentController.php 
modified:   SRC/public/js/ListeOeuvre.js
	modified:   SRC/resources/views/referent.blade.php
 2015-02-23 14:18:18 +01:00
Malibu d9cc1e2a4c modified: SRC/app/Http/Controllers/ReferentController.php 
modified:   SRC/app/Http/routes.php
	modified:   SRC/app/Models/Oeuvre.php
	modified:   SRC/resources/views/referent.blade.php
 2015-02-22 16:42:45 +01:00
Jerome Morjon 7d07bfbdca maj css home et game_ref 2015-02-21 16:54:08 +01:00
Jerome Morjon b31430469e ajout d'une icon game et suppression du texte game 2015-02-21 16:41:08 +01:00
Jerome Morjon 3a26e58fb4 suppression du coverflow 2015-02-21 16:35:30 +01:00
Jerome Morjon 2a4fef10d7 test du coverflow page d'acceuil 2015-02-21 03:53:55 +01:00
Jerome Morjon 9879943073 maj referent 2015-02-21 00:56:09 +01:00
Jerome Morjon 36a4d192e1 refonte du tableau de la page admin 2015-02-21 00:23:31 +01:00
Jerome Morjon 2cb24c6e1d maj du div gauche 
alignement du tableau
 2015-02-20 23:33:10 +01:00
Jerome Morjon 291a5c2937 remise en place des css + creation des css 2015-02-20 22:29:41 +01:00
Malibu a17832b4b6 modified: SRC/app/Http/Controllers/ReferentController.php 
modified:   SRC/resources/views/referent.blade.php
 2015-02-20 18:29:57 +01:00
Malibu 5fbb41a461 move models & view referent 2015-02-20 15:00:09 +01:00
Malibu fe746d6bbb modified: SRC/public/css/app.css 
modified:   SRC/resources/views/admin.blade.php
	modified:   SRC/resources/views/referent.blade.php
 2015-02-20 14:00:59 +01:00
Malibu 776940a70a modified: SRC/public/css/referent.css 
modified:   SRC/resources/views/referent.blade.php
 2015-02-20 12:49:51 +01:00
Jerome Morjon c41c6af4a1 maj referent non fini 2015-02-20 02:54:06 +01:00
Jerome Morjon 5b03b1ac6e Changement du theme de la nav bar 
change du style de la nav bar
ajout de la tranparance
changement de la couleur de la police
ajout d’un css
 2015-02-20 02:17:28 +01:00
Jerome Morjon ffeed0761c ajout caption 2015-02-20 01:32:02 +01:00
Jerome Morjon 167854e785 maj vue ref 
ajout du switch des oeuvres + fix button
 2015-02-20 01:28:03 +01:00
Jerome Morjon 994df6df07 maj liens images 2015-02-20 01:06:04 +01:00
Jerome Morjon b32d8b5167 switch inséré 2015-02-20 00:58:51 +01:00
Malibu 374add1ef6 ll 2015-02-19 23:25:06 +01:00
Malibu 00d0ef2684 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-19 23:06:53 +01:00
Malibu e7c0dbc238 jj 2015-02-19 23:06:04 +01:00
Jerome Morjon 6b88d2c9cd Merge remote-tracking branch 'origin/master' 
Conflicts:
	SRC/public/css/referent.css
	SRC/resources/views/referent.blade.php
 2015-02-19 23:02:35 +01:00
Jerome Morjon d80d18f9f0 maj css et button app.css 2015-02-19 23:02:06 +01:00
Malibu dd4f2c8241 m 2015-02-19 22:53:52 +01:00
sidya82 1ecdc1b3ff modifié : SRC/app/Http/Controllers/ReferentController.php 
modifié :         SRC/public/js/ListeOeuvre.js
	modifié :         SRC/resources/views/referent.blade.php
 2015-02-19 19:20:13 +01:00
Malibu b54fd5e95f modified: SRC/app/Http/Controllers/ReferentController.php 
deleted:    SRC/resources/views/referent.blade_old.php
 2015-02-19 18:39:44 +01:00
sidya82 2031282c06 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-19 18:13:46 +01:00
sidya82 634914e582 modifié : SRC/app/Http/Controllers/ReferentController.php 
modifié :         SRC/app/Http/routes.php
	renommé :         SRC/public/js/getListeOeuvre.js -> SRC/public/js/ListeOeuvre.js
	supprimé :        SRC/public/js/setListeOeuvre.js
	modifié :         SRC/resources/views/app.blade.php
	modifié :         SRC/resources/views/referent.blade.php
 2015-02-19 18:11:51 +01:00
Jerome Morjon 07095f6ac6 maj css ref 2015-02-19 18:00:00 +01:00
Malibu 71800eebbe modified: SRC/app/Http/Controllers/ReferentController.php 
modified:   SRC/resources/views/referent.blade.php
	new file:   SRC/resources/views/referent.blade_old.php
 2015-02-19 17:55:46 +01:00
Jerome Morjon d92ce6372d css ref 2015-02-19 17:29:04 +01:00
Malibu 192605eaf1 modified: SRC/resources/views/referent.blade.php 2015-02-19 17:13:24 +01:00
Malibu 70469b1e12 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-19 17:08:03 +01:00
Malibu f689ecef97 modified: SRC/public/js/getListeOeuvre.js 
modified:   SRC/resources/views/home.blade.php
	modified:   SRC/resources/views/referent.blade.php
 2015-02-19 17:07:41 +01:00
Jerome Morjon 4059881efd maj taille img 2015-02-19 16:56:05 +01:00
Jerome Morjon 400022380c maj home 2015-02-19 16:50:00 +01:00
Jerome Morjon dd386205b8 MAJ wallp 2015-02-19 16:45:25 +01:00
Malibu 94a2348737 modified: SRC/resources/views/referent.blade.php 2015-02-19 16:42:27 +01:00
Malibu 415fdb2812 modified: SRC/app/Http/Controllers/ReferentController.php 
modified:   SRC/resources/views/referent.blade.php
 2015-02-19 16:22:12 +01:00
Malibu d22f90d8ce blabla 2015-02-19 15:37:52 +01:00
sidya82 732c1d19f9 modified: SRC/app/Http/Controllers/LoginController.php 
modified:   SRC/resources/views/auth/login.blade.php
 2015-02-19 12:40:18 +01:00
sidya82 6ccba8eeba modified: SRC/app/Http/Controllers/LoginController.php 
modified:   SRC/resources/views/auth/reset.blade.php
 2015-02-19 12:30:16 +01:00
Malibu 76ddc88b20 modified: SRC/resources/views/referent.blade.php 2015-02-19 01:07:33 +01:00
Malibu 5ecdc37d36 modified: SRC/resources/views/referent.blade.php 2015-02-19 01:06:29 +01:00
Malibu c0feb36014 modified: app/Http/Controllers/ReferentController.php 
modified:   app/ListeOeuvre.php
	modified:   app/Oeuvre.php
	modified:   resources/views/referent.blade.php
 2015-02-19 00:15:29 +01:00
sidya82 887f1c9ebb Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 23:23:25 +01:00
sidya82 919a470528 modifié : SRC/app/Http/Controllers/LoginController.php 
modifié :         SRC/app/Http/routes.php
	modifié :         SRC/config/auth.php
	modifié :         SRC/resources/views/auth/reset.blade.php
	modifié :         SRC/resources/views/emails/password.blade.php
 2015-02-18 23:23:12 +01:00
Malibu 9339cdcc37 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 23:15:33 +01:00
Malibu 51fd0b06b9 database update 2015-02-18 23:15:18 +01:00
DonRenando 4239fccd4b erreur 2015-02-18 23:15:02 +01:00
DonRenando 8cc9176450 curseur2 2015-02-18 23:12:37 +01:00
DonRenando 357d903bb5 curseur 2015-02-18 23:03:16 +01:00
DonRenando 4cbb358f48 CSS4 2015-02-18 22:49:48 +01:00
DonRenando 2addf1a30b Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 21:16:01 +01:00
DonRenando 416ddb7a16 CSS2 2015-02-18 21:15:20 +01:00
Malibu 0eb41b4d93 tt 2015-02-18 20:03:19 +01:00
Malibu 5c2b07d715 modified: SRC/public/css/app.css 
modified:   SRC/resources/views/home.blade.php
 2015-02-18 18:51:07 +01:00
Malibu 6691ffba3a modified: SRC/resources/views/home.blade.php 2015-02-18 18:46:03 +01:00
DonRenando 21c28b0ad6 rechercher 2015-02-18 18:42:00 +01:00
DonRenando 2d89d56e8f taille max 2015-02-18 18:20:35 +01:00
Malibu fed82155dc update 2015-02-18 18:13:47 +01:00
DonRenando 2781c482c1 avatar referent 2015-02-18 17:58:11 +01:00
DonRenando fdccb846d5 formulaire 2015-02-18 17:11:59 +01:00
DonRenando 0ce3884cac bouton tableau 2015-02-18 16:55:17 +01:00
Malibu 3425dc66d9 upload picture 2015-02-18 16:49:02 +01:00
Malibu d8cdb49746 log as finished 2015-02-18 01:27:30 +01:00
Malibu a91807ba12 session log as 2015-02-18 01:21:24 +01:00
Malibu dea56f3c8c update user settings 2015-02-18 00:31:21 +01:00
Malibu 08292c07ab partial update 2015-02-18 00:01:05 +01:00
Malibu 3140338ee9 blabla 2015-02-17 23:29:20 +01:00
Malibu f1fb08a78f blabla admin 2015-02-17 23:19:06 +01:00
Malibu f90343a3ef blabla 2015-02-17 23:07:12 +01:00
Malibu 484e5f86ca fgh 2015-02-17 22:39:53 +01:00
Malibu fe630d6683 blabla 2015-02-17 22:10:27 +01:00
Malibu 109c9bc5f0 blabla 2015-02-17 22:01:22 +01:00
Malibu 75548c78f2 delete user 2015-02-17 21:57:41 +01:00