QRouland/ModuleWeb
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb

Browse Source
This commit is contained in:
sidya82 2015-02-18 19:30:16 +01:00
commit d8604edfb0
19 changed files with 91 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
.bash_history
View File

@ -82,3 +82,86 @@ ls
nano loadCSVAugustin2014.py nano loadCSVAugustin2014.py
git pull git pull
exit exit
git pull
exit
cd ..
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
cd ModuleWeb/
git pull
rm SRC/resources/views/admin.blade.php
git pull
nano SRC/app/Http/Middleware/RedirectIfNotAdmin.php
git commit -a
git commit -a
git commit -a
git push
git push
git commit -a
cd
cd ..
python loadCSVAugustin2014.py
cd ModuleWeb/
git pull
cd Src
cd SRC/
php artisan bd:seed
php artisan bd:seed
php artisan bd:seed
cd
python loadCSVAugustin2014.py
cd ..
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
python loadCSVAugustin2014.py
cd ModuleWeb/
git pull
git commit -a
git push
git commit -a
git push
python loadCSVAugustin2014.py
cd ..
python loadCSVAugustin2014.py

2
SRC/app/User.php
View File

@ -12,7 +12,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
protected $table = 'users'; protected $table = 'users';
//public $timestamps = false; public $timestamps = false;
/** /**
* The attributes that are mass assignable. * The attributes that are mass assignable.

0
SRC/public/pictures/homePic/bienvenue.png Normal file → Executable file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

0
SRC/public/pictures/homePic/fond.jpg Normal file → Executable file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 148 KiB

After

Width:  |  Height:  |  Size: 148 KiB

0
SRC/public/pictures/homePic/search.png Normal file → Executable file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
SRC/public/pictures/referent/francois.jpg Normal file → Executable file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

0
SRC/public/pictures/referent/hitler.jpg Normal file → Executable file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

0
SRC/public/pictures/referent/lepen.jpg Normal file → Executable file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 55 KiB

0
SRC/public/pictures/referent/nicolas.jpg Normal file → Executable file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

2
SRC/public/pictures/user_picture/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*
!default.jpg

BIN
SRC/public/pictures/user_picture/1
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 96 KiB

BIN
SRC/public/pictures/user_picture/2
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 24 KiB

BIN
SRC/public/pictures/user_picture/3
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 24 KiB

BIN
SRC/public/pictures/user_picture/5
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 80 KiB

BIN
SRC/public/pictures/user_picture/default.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
SRC/public/pictures/user_picture/default.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.7 KiB

8
SRC/resources/views/home.blade.php
View File

@ -1,13 +1,10 @@
@extends('app') @extends('app')
@section('content') @section('content')
<br>
<center> <center>
<!-- <img style="height:auto; width:auto; max-width:400px; alt="" src="./pictures/homePic/bienvenue.png"> --> <!-- <img style="height:auto; width:auto; max-width:400px; alt="" src="./pictures/homePic/bienvenue.png"> -->
<br> <nav>
<br> <form class="form-inline navbar-right">
<form class="form-inline">
<div class="form-group"> <div class="form-group">
<img alt="" src="./pictures/homePic/search.png"> <img alt="" src="./pictures/homePic/search.png">
<div class="input-group"> <div class="input-group">
@ -15,6 +12,7 @@
</div> </div>
</div> </div>
</form> </form>
</nav>
<br> <br>
<br> <br>