From 09a9f2c33dcbca5545eb905733e636aa7d028d64 Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Wed, 16 Jan 2019 16:18:34 +0100 Subject: [PATCH 1/3] Fix shell error on vagrant provision --- Vagrantfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Vagrantfile b/Vagrantfile index f17e66a..e57d359 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -9,6 +9,7 @@ load File.expand_path(vagrantfile) if File.exists?(vagrantfile) Vagrant.configure('2') do |config| config.vm.synced_folder "./", "/vagrant", type: "rsync", rsync__exclude: [ '.vagrant', '.git', 'config/config.ini' ] + config.ssh.shell="/bin/sh" config.vm.network "forwarded_port", guest: 80, host: 8080, auto_correct: true config.vm.network "forwarded_port", guest: 443, host: 8443, auto_correct: true From b4b23dfb0917c03c25aee629b14b38fe31161f3a Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Thu, 21 Mar 2019 17:58:54 +0100 Subject: [PATCH 2/3] Do not use base.html for login page --- htdocs/tpl/page/login.html | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/htdocs/tpl/page/login.html b/htdocs/tpl/page/login.html index a72d4dd..105e3df 100644 --- a/htdocs/tpl/page/login.html +++ b/htdocs/tpl/page/login.html @@ -1,6 +1,17 @@ -{% extends 'base.html' %} + + + + + + + {{ page_name }} + + + + + -{% block body %} +
{% include 'notif.html' %} {% if logout %} @@ -26,4 +37,7 @@
-{% endblock %} + + + + From bbd55a2e6728fd1df6128e3130ad8a3d43c5668e Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Thu, 28 Mar 2019 14:13:48 +0100 Subject: [PATCH 3/3] Fix Twig loading on PHP 5.6 --- htdocs/lib/MailNotify.php | 7 ++++++- htdocs/lib/PageController.php | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/htdocs/lib/MailNotify.php b/htdocs/lib/MailNotify.php index 3c16323..7793704 100644 --- a/htdocs/lib/MailNotify.php +++ b/htdocs/lib/MailNotify.php @@ -1,6 +1,11 @@