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

172 Commits

Author SHA1 Message Date
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
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
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 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
Malibu 198ca6f5dc blabla 2015-03-03 15:41:28 +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
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 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 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
Malibu 4c061c4d73 modified: SRC/app/Http/Controllers/ReferentController.php 2015-02-20 18:37:58 +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
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 8f96fc263a modifié : SRC/app/Http/Controllers/ReferentController.php 2015-02-19 18:13:37 +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
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
sidya82 2a18c47789 modifié : SRC/app/Http/Controllers/ReferentController.php 
modifié :         SRC/app/Http/routes.php
	modifié :         SRC/public/js/getListeOeuvre.js
 2015-02-19 17:35:57 +01:00
sidya82 d41fdb2815 modifié : SRC/app/Http/Controllers/ReferentController.php 
modifié :         SRC/public/js/getListeOeuvre.js
 2015-02-19 16:50:36 +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 6c7f24206c modified: SRC/app/Http/Controllers/LoginController.php 2015-02-19 12:41:41 +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 6aafd0ee5c deleted: SRC/app/Password_reset.php 2015-02-19 12:36:46 +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
sidya82 bfbe7809d7 new file: SRC/app/Password_reset.php 2015-02-19 12:07:12 +01:00
Malibu c8439e2ba5 modified: SRC/app/Http/Controllers/ReferentController.php 2015-02-19 01:03:45 +01:00
Malibu fa525a039f modified: SRC/app/Http/Controllers/ReferentController.php 2015-02-19 01:02:40 +01:00
Malibu 66fdc3896c modified: SRC/app/Http/Controllers/ReferentController.php 2015-02-19 01:01:26 +01:00
Malibu 3a0c848f10 modified: SRC/app/Http/Controllers/ReferentController.php 2015-02-19 00:51:27 +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
Malibu a63c91084b modif 2015-02-19 00:02:59 +01:00
sidya82 49128f261a modifié : SRC/app/Http/Controllers/LoginController.php 2015-02-18 23:35:52 +01:00
sidya82 c42909f8a1 nouveau fichier : SRC/app/Http/routes.php 2015-02-18 23:33:40 +01:00
www ee5c34274c Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 
Conflicts:
	SRC/app/Http/routes.php

	modified:   SRC/app/Http/Controllers/LoginController.php
	deleted:    SRC/app/Http/routes.php
	modified:   SRC/config/auth.php
	modified:   SRC/resources/views/auth/reset.blade.php
	modified:   SRC/resources/views/emails/password.blade.php
 2015-02-18 23:32:05 +01:00
www 55660ca1e8 modified: SRC/app/Http/routes.php 2015-02-18 23:28:43 +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 51fd0b06b9 database update 2015-02-18 23:15:18 +01:00
Malibu 0eb41b4d93 tt 2015-02-18 20:03:19 +01:00
sidya82 d8604edfb0 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 19:30:16 +01:00
sidya82 ebfb765bba modifié : SRC/app/Http/Controllers/LoginController.php 
modifié :         SRC/config/auth.php
	modifié :         SRC/config/mail.php
	modifié :         SRC/init/table.sql
 2015-02-18 19:29:51 +01:00
Malibu 99b3bff06d fix upload in User model 2015-02-18 18:40:00 +01:00
Malibu fed82155dc update 2015-02-18 18:13:47 +01:00
Malibu 3425dc66d9 upload picture 2015-02-18 16:49:02 +01:00
www 06114bba37 modified: SRC/app/Http/Middleware/RedirectIfNotAdmin.php 2015-02-18 01:24:30 +01:00
www 09ab8c15ee modified: .bash_history 
modified:   SRC/app/Http/Middleware/RedirectIfNotAdmin.php
 2015-02-18 01:23:17 +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 f90343a3ef blabla 2015-02-17 23:07:12 +01:00
sidya82 860189859b modifié : SRC/app/Http/Controllers/LoginController.php 2015-02-17 22:45:45 +01:00
Malibu 8db3ab513c Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-17 22:40:13 +01:00
Malibu 484e5f86ca fgh 2015-02-17 22:39:53 +01:00
sidya82 74b69bc159 modifié : SRC/app/Http/Middleware/RedirectIfNotAdmin.php 
modifié :         SRC/init/table.sql
 2015-02-17 22:24:10 +01:00
www 6469a4e793 modified: SRC/app/Http/Middleware/RedirectIfNotAdmin.php 2015-02-17 22:19:10 +01:00
Malibu fe630d6683 blabla 2015-02-17 22:10:27 +01:00
Malibu 75548c78f2 delete user 2015-02-17 21:57:41 +01:00
Malibu 4a5dbde1c9 update navbar 2015-02-17 21:12:16 +01:00