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

342 Commits

Author SHA1 Message Date
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
sidya82 2e32045c5d modified: SRC/resources/views/referent.blade.php 2015-03-03 17:49:18 +01:00
sidya82 643cd4ed66 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-03-03 17:47:40 +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
www 20c7a0255c modified: SRC/init/loadCSVAugust2014.py 2015-03-03 17:19:50 +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 d26773dfd9 modification ville en ecole 2.0 2015-03-03 13:53:41 +01:00
DonRenando c8a967dece modification ville en ecole 2015-03-03 13:49:53 +01:00
sidya82 caed3d7972 modifié : SRC/public/js/ListeOeuvre.js 2015-03-03 12:24:43 +01:00
DonRenando 3a980e247b ajax 2015-03-03 12:05:09 +01:00
sidya82 61f4439942 modifié : SRC/public/js/ListeOeuvre.js 2015-03-03 11:48:16 +01:00
www 77544b7ed4 new file: SRC/init/loadCSVAugust2014.py 2015-03-03 10:54:14 +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
sidya82 31b5e76cbe modifié : SRC/public/js/ListeOeuvre.js 2015-03-02 11:55:04 +01:00
Jerome Morjon 233303e7b2 remis 2015-03-02 11:19:22 +01:00
Malibu 29e8b82b3f modified: SRC/public/js/ListeOeuvre.js 2015-02-27 15:31:11 +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 485f0019f0 ff 2015-02-25 19:48:34 +01:00
Malibu ecf963857b modified: SRC/public/js/ListeOeuvre.js 2015-02-24 12:19:17 +01:00
Malibu 95ff2cadcf fix bug 2015-02-24 12:06:24 +01:00
Malibu d661ecb9f8 new file: SRC/app/Http/Controllers/ReferentController.php 2015-02-24 11:50:17 +01:00
www 3d2d69cf26 bug 2015-02-24 11:50:00 +01:00
www 7a427b2b4e Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-24 11:46:58 +01:00
Malibu 0b48ebc872 modified: SRC/app/Http/Controllers/ReferentController.php 2015-02-24 11:45:24 +01:00
www cd11f29a18 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-24 11:41:19 +01:00
Malibu ed12c2cc6b modified: SRC/app/Http/Controllers/ReferentController.php 2015-02-24 11:39:59 +01:00
www 52cae36ce6 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-24 11:36:54 +01:00
Malibu c2bef25f88 modified: SRC/app/Http/Controllers/ReferentController.php 
modified:   SRC/app/Http/routes.php
	modified:   SRC/public/js/ListeOeuvre.js
 2015-02-24 11:35:26 +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 407a955444 modified: SRC/app/Http/routes.php 
modified:   SRC/public/js/ListeOeuvre.js
 2015-02-23 19:40:01 +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 f6027554fe modified: SRC/app/Http/Controllers/ReferentController.php 
modified:   SRC/app/Models/Oeuvre.php
 2015-02-23 12:23:01 +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 2399b7eace maj taille police 2015-02-21 16:59:22 +01:00