diff --git a/.bash_history b/.bash_history index df555c9..7121085 100755 --- a/.bash_history +++ b/.bash_history @@ -82,3 +82,86 @@ ls nano loadCSVAugustin2014.py git pull 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 diff --git a/SRC/.gitignore b/SRC/.gitignore index c47965c..abaa940 100755 --- a/SRC/.gitignore +++ b/SRC/.gitignore @@ -1,3 +1,3 @@ /vendor /node_modules -.env +.env \ No newline at end of file diff --git a/SRC/app/User.php b/SRC/app/User.php index c169f31..38c7b75 100755 --- a/SRC/app/User.php +++ b/SRC/app/User.php @@ -12,7 +12,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon protected $table = 'users'; - //public $timestamps = false; + public $timestamps = false; /** * The attributes that are mass assignable. diff --git a/SRC/public/css/app.css b/SRC/public/css/app.css index 906ae97..a1efff6 100755 --- a/SRC/public/css/app.css +++ b/SRC/public/css/app.css @@ -6263,4 +6263,4 @@ body, label, .checkbox label { font-weight: 300; -} +} \ No newline at end of file diff --git a/SRC/public/pictures/homePic/bienvenue.png b/SRC/public/pictures/homePic/bienvenue.png old mode 100644 new mode 100755 diff --git a/SRC/public/pictures/homePic/fond.jpg b/SRC/public/pictures/homePic/fond.jpg old mode 100644 new mode 100755 diff --git a/SRC/public/pictures/homePic/search.png b/SRC/public/pictures/homePic/search.png old mode 100644 new mode 100755 diff --git a/SRC/public/pictures/referent/francois.jpg b/SRC/public/pictures/referent/francois.jpg old mode 100644 new mode 100755 diff --git a/SRC/public/pictures/referent/hitler.jpg b/SRC/public/pictures/referent/hitler.jpg old mode 100644 new mode 100755 diff --git a/SRC/public/pictures/referent/lepen.jpg b/SRC/public/pictures/referent/lepen.jpg old mode 100644 new mode 100755 diff --git a/SRC/public/pictures/referent/nicolas.jpg b/SRC/public/pictures/referent/nicolas.jpg old mode 100644 new mode 100755 diff --git a/SRC/public/pictures/user_picture/.gitignore b/SRC/public/pictures/user_picture/.gitignore new file mode 100644 index 0000000..bbf8fbf --- /dev/null +++ b/SRC/public/pictures/user_picture/.gitignore @@ -0,0 +1,2 @@ +* +!default.jpg diff --git a/SRC/public/pictures/user_picture/1 b/SRC/public/pictures/user_picture/1 deleted file mode 100644 index 7c5e2bf..0000000 Binary files a/SRC/public/pictures/user_picture/1 and /dev/null differ diff --git a/SRC/public/pictures/user_picture/2 b/SRC/public/pictures/user_picture/2 deleted file mode 100644 index e7ed84f..0000000 Binary files a/SRC/public/pictures/user_picture/2 and /dev/null differ diff --git a/SRC/public/pictures/user_picture/3 b/SRC/public/pictures/user_picture/3 deleted file mode 100644 index e7ed84f..0000000 Binary files a/SRC/public/pictures/user_picture/3 and /dev/null differ diff --git a/SRC/public/pictures/user_picture/5 b/SRC/public/pictures/user_picture/5 deleted file mode 100644 index 0217349..0000000 Binary files a/SRC/public/pictures/user_picture/5 and /dev/null differ diff --git a/SRC/public/pictures/user_picture/default.jpg b/SRC/public/pictures/user_picture/default.jpg new file mode 100644 index 0000000..eded1d6 Binary files /dev/null and b/SRC/public/pictures/user_picture/default.jpg differ diff --git a/SRC/public/pictures/user_picture/default.png b/SRC/public/pictures/user_picture/default.png deleted file mode 100755 index 0b65f33..0000000 Binary files a/SRC/public/pictures/user_picture/default.png and /dev/null differ diff --git a/SRC/resources/views/home.blade.php b/SRC/resources/views/home.blade.php index 1349ce3..d311dbf 100755 --- a/SRC/resources/views/home.blade.php +++ b/SRC/resources/views/home.blade.php @@ -1,13 +1,10 @@ @extends('app') @section('content') - -
-
-
-
+