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

195 Commits

Author SHA1 Message Date
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
matthieupenchenat81 31f0415ea1 Delete 3 2015-02-18 18:54:51 +01:00
matthieupenchenat81 b94e5f2b29 Delete 2 2015-02-18 18:54:45 +01:00
matthieupenchenat81 06fb78e8e8 Delete 1 2015-02-18 18:54:37 +01:00
www dc25fec393 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:54:33 +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
www 9e9323ab83 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:43:03 +01:00
Malibu 531a337208 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:42:41 +01:00
DonRenando 21c28b0ad6 rechercher 2015-02-18 18:42:00 +01:00
Malibu c43a686109 modified: SRC/.gitignore 2015-02-18 18:41:30 +01:00
Malibu 6dc2dd41a1 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:41:09 +01:00
Malibu 99b3bff06d fix upload in User model 2015-02-18 18:40:00 +01:00
www ea520351af Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 18:32:16 +01:00
www 4563ddfa54 lol 2015-02-18 18:32:12 +01:00
DonRenando fe922c47b0 taille max 2015-02-18 18:27:58 +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 b35dd2bda1 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 17:14:26 +01:00
DonRenando fdccb846d5 formulaire 2015-02-18 17:11:59 +01:00
Malibu dc983a9271 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-18 17:00:31 +01:00
Malibu 1f7bc48129 fix upload_ref 2015-02-18 17:00:02 +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
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 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
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
sidya82 c277b5678d Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-17 22:20:17 +01:00
sidya82 6ee394dc20 modifié : SRC/init/table.sql 2015-02-17 22:19:47 +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 109c9bc5f0 blabla 2015-02-17 22:01:22 +01:00
Malibu 75548c78f2 delete user 2015-02-17 21:57:41 +01:00
DonRenando baac10fe23 logo log in 2015-02-17 21:36:52 +01:00
DonRenando 9da9e13241 new button connexion 2015-02-17 21:28:44 +01:00
Malibu 4a5dbde1c9 update navbar 2015-02-17 21:12:16 +01:00
Malibu 6822c63274 update admin view 2015-02-17 20:53:30 +01:00
Malibu f64fd23032 update admin vue 2015-02-17 20:46:50 +01:00
Malibu 6490543c10 Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb 2015-02-17 20:33:39 +01:00
Malibu 491af90f0f up 2015-02-17 20:33:32 +01:00
sidya82 be1d9e5051 modifié : SRC/init/table.sql 2015-02-17 20:21:30 +01:00
DonRenando 7318ca6884 new table and button 2015-02-17 19:44:34 +01:00
Malibu 755f691478 eloquent - no request in view 2015-02-17 15:56:30 +01:00