From 97fdd671a2e7a8b51cbc250802825df22e4a9c50 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Tue, 11 Sep 2018 17:33:40 +0000 Subject: [PATCH 01/24] Add CHANGELOG --- CHANGELOG | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 CHANGELOG diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 00000000..843077c6 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,28 @@ + Nouveauté + + Amélioration générale de l'horaire + Ajout de la section message + Ajout de la section statistique + Ajout de la section utilisateur + Ajout de la section configuration + Ajout de modèle de poste + Ajout de modèle de grade + Ajout de notification par Email + Ajout de notification par SMS + Ajout de notification interne + +Back End & API + + Ajout d'une liste de locaux dynamique + Ajout d'une liste de poste dynamique + Ajout d'une liste de grade dynamique + Ajout d'une authentification par token pour les requetes API + Ajout d'un "Middleware" pour les staffs + Ajout d'un "Middleware" pour les admins + Ajout du plugin DataTable + Modification de la table de données des permissions de "Boolean" a "String" + Ajout de page d'erreur personnalisé + +Correction de bug + + Correction de multiple bug \ No newline at end of file From 7be3c658125c916447b5f1d4f5eb65574fcc015f Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Tue, 11 Sep 2018 17:36:54 +0000 Subject: [PATCH 02/24] Add LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..bc53d22d --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 Mathieu Lagace + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 390e6c82e7c6d0da0d6ff1437628c0649131f838 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Tue, 11 Sep 2018 18:30:48 +0000 Subject: [PATCH 03/24] Update CHANGELOG --- CHANGELOG | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 843077c6..445733e9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,24 @@ - Nouveauté +/** ALPHA 3.0.3 **/ +Nouveauté + + Mise à jour de la section notification. + Ajout d'une option pour bloquer les notifications de l'horaire lors de ça construction initiale. + +Back End & API + + Mise à jours du nom de l'adresse d'envois de Email + Mise à jours de l'adresse d'envois de Email + Ajout de la suppression de notification + Ajout de notification Email et Alert lors de l'ajout d'evenement a l'horaire + +Correction de bug + + Correction de multiple bug + + + +/** ALPHA 3.0.2 **/ +Nouveauté Amélioration générale de l'horaire Ajout de la section message From d41147346cc71d80e73b0d1cd28c91488c55dfa6 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Thu, 20 Sep 2018 15:21:08 +0000 Subject: [PATCH 04/24] Update CHANGELOG --- CHANGELOG | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 445733e9..f7b58c4a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,19 @@ +/** ALPHA 3.0.4 **/ + Nouveauté + + Création de l'espace cadet cadre. + Ajout de nouveau type d'icones. + +Back End & API + + Ajout de CSS spécifique au calendrier + Ajout d'un controller pour l'ECC + +Correction de bug + + Correction de multiple bug + + /** ALPHA 3.0.3 **/ Nouveauté From d5c6a534b516c579203423df67eb6441c7400db4 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Fri, 21 Sep 2018 18:34:01 +0000 Subject: [PATCH 05/24] Update CHANGELOG --- CHANGELOG | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f7b58c4a..514223d2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,26 @@ +/** ALPHA 3.0.5 **/ +Front-End + + Ajout d'un quantité d'item dans l'inventaire. + Modification de l'interface de la gestion d'inventaire pour accomoder l'ajout de quantité. + Ajout d'un indicateur de status sur la page de connexion.. + Le rapport de bug est maintenant publique. + Ajout du dashboard administrateur. + Ajout d'option de configuration générale.' + +Back End & API + + Modification du model de réservation pour accomoder l'ajout de quantité. + Ajout d'une quantité d'item a l'inventaire. + Ajout d'un « Helper » pour connaitre le status des services. + Ajout d'une section « Alerte » dans le modele de page Admin. + +Correction de bug + + Correction de - Bug avec les heures quand il s'agit d'une activité "Autre" - #22 + Correction de - Bug ECC" - #21 + Correction de multiple bug + /** ALPHA 3.0.4 **/ Nouveauté From 863a701e084e41ee578ef0cdd07365218a452a3d Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 13:12:47 +0000 Subject: [PATCH 06/24] Add .gitlab-ci.yml --- .gitlab-ci.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..89cdc025 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,24 @@ +before_script: + - apt-get update -qq && apt-get install -y -qq sshpass + +deploy_stage: + stage: deploy + environment: Staging + only: + - master + script: + - sshpass -V + - export SSHPASS=$USER_PASS + - sshpass -e scp -o stricthostkeychecking=no -r . username@host.com:/var/www/html + +deploy_production: + stage: deploy + environment: Production + only: + - tags + script: + - sshpass -V + - export SSHPASS=$USER_PASS + - sshpass -e scp -o stricthostkeychecking=no -r . username@host.com:/var/www/html +view raw +.gitlab-ci.yml hosted with ❤ by GitHub From 033a2d65d87185b094779e2cecedf38669f0bf44 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 13:18:07 +0000 Subject: [PATCH 07/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 89cdc025..31edb645 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ deploy_stage: script: - sshpass -V - export SSHPASS=$USER_PASS - - sshpass -e scp -o stricthostkeychecking=no -r . username@host.com:/var/www/html + - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/C697 deploy_production: stage: deploy @@ -19,6 +19,4 @@ deploy_production: script: - sshpass -V - export SSHPASS=$USER_PASS - - sshpass -e scp -o stricthostkeychecking=no -r . username@host.com:/var/www/html -view raw -.gitlab-ci.yml hosted with ❤ by GitHub + - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/C697 From afa7e47ef3a7d3529d5d5f3d2d871a2ba21610d1 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 13:20:32 +0000 Subject: [PATCH 08/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31edb645..94d01a08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ deploy_stage: script: - sshpass -V - export SSHPASS=$USER_PASS - - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/C697 + - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 deploy_production: stage: deploy @@ -19,4 +19,4 @@ deploy_production: script: - sshpass -V - export SSHPASS=$USER_PASS - - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/C697 + - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 From e3aa153cf8533dd61f219776350598f361eb321c Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 13:45:37 +0000 Subject: [PATCH 09/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94d01a08..29c44d24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,11 @@ deploy_stage: - sshpass -V - export SSHPASS=$USER_PASS - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 + - cd /var/www/website/C697 + - sudo chmod -R 777 storage + - sudo chmod -R 777 bootstrap + - sudo composer update + - php artisan migrate deploy_production: stage: deploy @@ -20,3 +25,8 @@ deploy_production: - sshpass -V - export SSHPASS=$USER_PASS - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 + - cd /var/www/website/C697 + - sudo chmod -R 777 storage + - sudo chmod -R 777 bootstrap + - sudo composer update + - php artisan migrate From 1d13c8c8a9b434ede06e60a3484cdc20f1168afd Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 14:13:01 +0000 Subject: [PATCH 10/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29c44d24..b82318f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ deploy_stage: - sshpass -V - export SSHPASS=$USER_PASS - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 + - ssh admin@54.39.97.124 - cd /var/www/website/C697 - sudo chmod -R 777 storage - sudo chmod -R 777 bootstrap @@ -25,6 +26,7 @@ deploy_production: - sshpass -V - export SSHPASS=$USER_PASS - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 + - ssh admin@54.39.97.124 - cd /var/www/website/C697 - sudo chmod -R 777 storage - sudo chmod -R 777 bootstrap From 34a4ebb2a8f0ecbd0fa4adf54dc72582d0ed0cd2 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 14:35:01 +0000 Subject: [PATCH 11/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b82318f6..5f4b4ce2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,12 +10,12 @@ deploy_stage: - sshpass -V - export SSHPASS=$USER_PASS - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 - - ssh admin@54.39.97.124 - - cd /var/www/website/C697 - - sudo chmod -R 777 storage - - sudo chmod -R 777 bootstrap - - sudo composer update - - php artisan migrate + - sshpass -e ssh admin@54.39.97.124 + - sshpass -e cd /var/www/website/C697 + - sshpass -e sudo chmod -R 777 storage + - sshpass -e sudo chmod -R 777 bootstrap + - sshpass -e sudo composer update + - sshpass -e php artisan migrate deploy_production: stage: deploy From 5597ded1ea4289b5e40d3709f0f5758ee7f557c8 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 14:46:40 +0000 Subject: [PATCH 12/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f4b4ce2..99bdd446 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,13 +9,8 @@ deploy_stage: script: - sshpass -V - export SSHPASS=$USER_PASS - - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 - sshpass -e ssh admin@54.39.97.124 - - sshpass -e cd /var/www/website/C697 - - sshpass -e sudo chmod -R 777 storage - - sshpass -e sudo chmod -R 777 bootstrap - - sshpass -e sudo composer update - - sshpass -e php artisan migrate + - ls deploy_production: stage: deploy From 871877ca375aa7b6efbd997a93dc5aa8ab42633f Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 14:54:13 +0000 Subject: [PATCH 13/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99bdd446..ea9604eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ deploy_stage: script: - sshpass -V - export SSHPASS=$USER_PASS - - sshpass -e ssh admin@54.39.97.124 + - sshpass -e ssh -t admin@54.39.97.124 - ls deploy_production: From f600c5cbb4d7f32e83fef910f6c6edc58c4e8042 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 15:00:05 +0000 Subject: [PATCH 14/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea9604eb..d41611e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,7 @@ deploy_stage: script: - sshpass -V - export SSHPASS=$USER_PASS - - sshpass -e ssh -t admin@54.39.97.124 - - ls + - ssh admin@54.39.97.124 "ls" deploy_production: stage: deploy From 5922024c70b0bfd82500f4cdc4247bd2d3bbe481 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 15:03:54 +0000 Subject: [PATCH 15/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d41611e0..d9384bc4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,8 +8,13 @@ deploy_stage: - master script: - sshpass -V - - export SSHPASS=$USER_PASS - - ssh admin@54.39.97.124 "ls" + - export SSHPASS=$USER_PASS + - ls + - sudo chmod -R 777 storage + - sudo chmod -R 777 bootstrap + - sudo composer update + - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 + - sshpass -e ssh -t admin@54.39.97.124 "cd /var/www/website/C697 && php artisan migrate" deploy_production: stage: deploy @@ -18,11 +23,10 @@ deploy_production: - tags script: - sshpass -V - - export SSHPASS=$USER_PASS - - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 - - ssh admin@54.39.97.124 - - cd /var/www/website/C697 + - export SSHPASS=$USER_PASS + - ls - sudo chmod -R 777 storage - sudo chmod -R 777 bootstrap - sudo composer update - - php artisan migrate + - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 + - sshpass -e ssh -t admin@54.39.97.124 "cd /var/www/website/C697 && php artisan migrate" From bcc293a5d476ecef42ddc933af850812116bd3d2 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 15:05:19 +0000 Subject: [PATCH 16/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9384bc4..446e5254 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,9 +10,9 @@ deploy_stage: - sshpass -V - export SSHPASS=$USER_PASS - ls - - sudo chmod -R 777 storage - - sudo chmod -R 777 bootstrap - - sudo composer update + - chmod -R 777 storage + - chmod -R 777 bootstrap + - composer update - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 - sshpass -e ssh -t admin@54.39.97.124 "cd /var/www/website/C697 && php artisan migrate" From d5151920d817e5fcfe014fec165d85a1e0f8790e Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 15:08:32 +0000 Subject: [PATCH 17/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 446e5254..7f713420 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,11 @@ before_script: - apt-get update -qq && apt-get install -y -qq sshpass + - apt-get install zip unzip + - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" + - php composer-setup.php + - php -r "unlink('composer-setup.php');" + - php composer.phar install + - npm install deploy_stage: stage: deploy From c0367459886740a0ad9a57b3acac543fe6dc366d Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 15:15:21 +0000 Subject: [PATCH 18/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f713420..4bce7772 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,14 @@ +image: php:7.2 + +cache: + paths: + - vendor/ + before_script: - - apt-get update -qq && apt-get install -y -qq sshpass - - apt-get install zip unzip - - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - - php composer-setup.php - - php -r "unlink('composer-setup.php');" - - php composer.phar install - - npm install +- apt-get update -qq && apt-get install -y -qq sshpass +- apt-get install git -yqq +- curl -sS https://getcomposer.org/installer | php +- php composer.phar install deploy_stage: stage: deploy From 712246e6cbb77720abbfe2934e3eb8cfe26ee929 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 15:19:14 +0000 Subject: [PATCH 19/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4bce7772..13e75a2a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ cache: before_script: - apt-get update -qq && apt-get install -y -qq sshpass +- apt-get install zip unzip - apt-get install git -yqq - curl -sS https://getcomposer.org/installer | php - php composer.phar install From 70bb173eb0ca95d46f57e44abecf32d03f2713fa Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 15:22:38 +0000 Subject: [PATCH 20/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13e75a2a..249b5c1e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ before_script: - apt-get install git -yqq - curl -sS https://getcomposer.org/installer | php - php composer.phar install +- mv composer.phar /usr/local/bin/composer deploy_stage: stage: deploy From b44a8b94fbd8afd415e0f9bc1cdc358f381c7868 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 15:34:43 +0000 Subject: [PATCH 21/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 249b5c1e..02ac79ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,6 @@ deploy_stage: script: - sshpass -V - export SSHPASS=$USER_PASS - - ls - chmod -R 777 storage - chmod -R 777 bootstrap - composer update @@ -35,9 +34,8 @@ deploy_production: script: - sshpass -V - export SSHPASS=$USER_PASS - - ls - - sudo chmod -R 777 storage - - sudo chmod -R 777 bootstrap - - sudo composer update + - chmod -R 777 storage + - chmod -R 777 bootstrap + - composer update - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 - sshpass -e ssh -t admin@54.39.97.124 "cd /var/www/website/C697 && php artisan migrate" From 2ffa5d1ba35d209c51feee361163ab51fe0cc18a Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 16:07:19 +0000 Subject: [PATCH 22/24] Update .gitlab-ci.yml --- .gitlab-ci.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02ac79ad..7d77ac8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,18 +24,6 @@ deploy_stage: - chmod -R 777 bootstrap - composer update - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 + - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C736 - sshpass -e ssh -t admin@54.39.97.124 "cd /var/www/website/C697 && php artisan migrate" - -deploy_production: - stage: deploy - environment: Production - only: - - tags - script: - - sshpass -V - - export SSHPASS=$USER_PASS - - chmod -R 777 storage - - chmod -R 777 bootstrap - - composer update - - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 - - sshpass -e ssh -t admin@54.39.97.124 "cd /var/www/website/C697 && php artisan migrate" + - sshpass -e ssh -t admin@54.39.97.124 "cd /var/www/website/C736 && php artisan migrate" \ No newline at end of file From ffe8032cc80afa796032af155c71caadec496714 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 16:07:49 +0000 Subject: [PATCH 23/24] Deleted resources/views/public.blade.php --- resources/views/public.blade.php | 169 ------------------------------- 1 file changed, 169 deletions(-) delete mode 100644 resources/views/public.blade.php diff --git a/resources/views/public.blade.php b/resources/views/public.blade.php deleted file mode 100644 index 38cf5c99..00000000 --- a/resources/views/public.blade.php +++ /dev/null @@ -1,169 +0,0 @@ - - - - - Escadron 697 - - - - - - - - -
- - - - - - - - -
-
-
-

- L'ESCADRON 697 ROTARY RIMOUSKI C'EST ... -

-

De nombreuses activités hebdomadaires dont : les soirées du vendredi, les soirées de musique (fanfare), l'entrainement au tir, une équipe de biathlon, des cours de pilotage et plus encore !

-
- -
-
- - -
-
-
-

Soirées du vendredi soir

-

La plupart de nos vendredis sont consacrés à des cours donnés par les cadets-cadres, sur divers sujet liés au programme des Cadets, tandis que certains sont occupés par des activités spéciale, comme des conférencier par exemple.

-
-
-
-
-

SURVIES D'AUTOMNE ET D'HIVER

-

Exercices aventuriers de 3 jours en forêt pendant lesquels nos cadets développent leurs compétences de survie. Plaisir et dépassement de soi sont au rendez-vous !

-
-
-
-
-

LE PILOTAGE

-

Il s'agit de ce qui nous diférencie des autres éléments, les cours de pilotage. Les cadets ont la possibilité d'obtenir leur licence de pilotage gratuitement! Les cours donnés une fois par semaine entretiennent le culte des Pilots!

-
-
-
- - -
-
-
-

Photos

-

Voici quelques photos de nos activités, même s'il est mieux d'y participer réellement!

-
-
    -
  • -

    Un Cadet-Cadre qui a été trop efficace

    -

    Les Cadets-Cadre travaillent très fort en survie, comme en témoigne l'Adjudant Première Classe Lagacé.

    -
    • -
  • -

    Une activité en attente de cours de survie

    -

    Une activité organisée par les Cadets-Cadre, dans l'attente d'un cour.

    -
    • -
  • -

    Un ancienne tenue de l'armée

    -

    Un de nos cadet-cadre qui a trouvé une tenue qui lui va à merveille!

    -
    • -
  • -

    Le Sergent de section Pettigrew dans une ancienne tenue militaire

    -

    Lors de notre voyage de fin d'année de 2018, les cadets ont pu essayer d'anciens uniforme de l'armée.

    -
    • -
  • -

    Parade du jour du Souvenir

    -

    Comme à chaque année, l'escadron participe à la parade du Jour du Souvenir, pour honorer les canadiens tombés au combat.

    -
    • -
  • -

    Hélicoptère Griffon

    -

    Lors d'une activité spéciale, les cadets on eu la chance unique de faire un tour de Griffon.

    -
    • -
  • -

    Avion anti-incendie

    -

    Lors d'une autre activité spéciale, les cadets ont eu la chance de visiter l'intérieur d'un CL-415 et de discuter avec les pilotes.

    -
    • -
  • -

    Cadet-cadre qui obtient ses licences de planeur

    -

    À la fin de cet été, un de nos cadets-cadres sortants, a obtenu ses ailes de planeur, à la suite d'un camp de 6 semaines. Félicitation!

    -
    • -
-
-
- - -
-
-

ÊTES-VOUS PRÊT À EN FAIRE PARTIE ?

- 540 RUE ST GERMAIN EST, RIMOUSKI, QC G5L 1E9 - (418) 722-7712 -
-
- - - - -
- - - - - - - - - - - - \ No newline at end of file From 027e6e6b28261a5c54c361a12feca2ba735f9392 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 24 Sep 2018 16:08:08 +0000 Subject: [PATCH 24/24] Update resources/views/public.blade.php Deleted resources/views/default.blade.php --- resources/views/{default.blade.php => public.blade.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/views/{default.blade.php => public.blade.php} (100%) diff --git a/resources/views/default.blade.php b/resources/views/public.blade.php similarity index 100% rename from resources/views/default.blade.php rename to resources/views/public.blade.php