Commit Graph

210 Commits

Author SHA1 Message Date
sidya82 465098a463 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-19 16:51:20 +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
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 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 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 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
DonRenando d9ad799a5a Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 23:17:33 +01:00
DonRenando dbf284c117 erreur2 2015-02-18 23:16:41 +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 278fa55ed8 CSS3 2015-02-18 22:17:31 +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
DonRenando c8c4e3b9c6 CSS 2015-02-18 19:52:26 +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 e674d9ef88 ll 2015-02-18 19:18:15 +01:00
Malibu 2cdcfb3b01 add folder picture 2015-02-18 19:16:30 +01:00
www 846ef181b1 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 19:12:25 +01:00
www 06c3795823 tt 2015-02-18 19:12:05 +01:00
Malibu cd05e345e5 blabla 2015-02-18 19:04:49 +01:00
Malibu 2f0ad27af9 blabla 2015-02-18 18:59:02 +01:00
Malibu 37ffb272da Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:57:32 +01:00
Malibu 3acae105d8 modified: SRC/.gitignore
SRC/public/pictures/.gitignore
2015-02-18 18:56:35 +01:00
matthieupenchenat81 d4c519a357 Delete 5 2015-02-18 18:54:58 +01:00