From 5f134d2b342f736857414450a5fb04eac2e315aa Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Fri, 23 Aug 2019 08:11:49 +0200 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20Try=20to=20use=20di?= =?UTF-8?q?rected=20acyclic=20graphs=20in=20CI=20pipeline?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50d967e..d68ee6a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,8 @@ variables: paths: - local.tar expire_in: 3 hours + needs: + - carton after_script: - tar cf local.tar local/ @@ -51,14 +53,14 @@ variables: .sqlite_template: &sqlite_definition <<: *tests_template - dependencies: + needs: - carton_sqlite services: - name: rroemhild/test-openldap alias: rroemhild-test-openldap .pg_template: &pg_definition <<: *tests_template - dependencies: + needs: - carton_postgresql services: - name: postgres:11 @@ -67,7 +69,7 @@ variables: alias: rroemhild-test-openldap .mysql_template: &mysql_definition <<: *tests_template - dependencies: + needs: - carton_mysql services: - name: mariadb:10.3 From 698ceb2c7a254567be913e7c0827e3330d9c8e34 Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Sun, 29 Sep 2019 16:33:04 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=93=9D=20=E2=80=94=20Remove=20redunda?= =?UTF-8?q?nt=20fixed=5Fdomain=20setting=20in=20conf=20template?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lufi.conf.template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lufi.conf.template b/lufi.conf.template index bb01829..c60cdf9 100644 --- a/lufi.conf.template +++ b/lufi.conf.template @@ -101,10 +101,6 @@ # optional, no domains allowed by default #allowed_domains => ['http://1.example.com', 'http://2.example.com'], - # If set, the shortened URLs will use this domain - # optional - #fixed_domain => 'example.org', - # Define a path to the upload directory, where the uploaded files will be stored # You can define it relative to lufi directory or set an absolute path # Remember that it has to be in a directory writable by Lufi user From b59845074fa3b0e707673734532ff8d0f8d0c3bc Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Sun, 29 Sep 2019 16:42:51 +0200 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=99=88=20=E2=80=94=20Ignore=20all=20.?= =?UTF-8?q?conf=20files=20in=20.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 58125ef..f8d4701 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ local/* files/* cover_db/* -lufi.conf +*.conf *.db *.db-shm *.db-wal From be0b3c7b2cb5c5ed7e40ed634a249d4e25d98292 Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Sun, 29 Sep 2019 16:44:51 +0200 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=90=9B=20=E2=80=94=20Fix=20#161=20?= =?UTF-8?q?=E2=80=94=20Translate=20dates=20in=20invitations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Many thanks to https://framagit.org/RainX who reported the bug and provided the fix 🙂 --- AUTHORS.md | 1 + CHANGELOG | 3 +++ lib/Lufi/Controller/Invitation.pm | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index cbfbe5f..09a575e 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -29,6 +29,7 @@ - Mildis (bugfix) - TECH'advantage, https://www.tech-advantage.com/ (paid for LDAP invitations feature) - pi2 (typo) +- Rain (bugfix) ## Vulnerabilities / bug hunters 🐛 diff --git a/CHANGELOG b/CHANGELOG index ad24f44..b88d060 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ Revision history for Lufi ?.??.? ????-??-?? + - Translate dates in invitations (#161) + - Ignore all .conf files in .gitignore + - Remove redundant fixed_domain setting in conf template 0.04.2 2019-08-14 - Update german language diff --git a/lib/Lufi/Controller/Invitation.pm b/lib/Lufi/Controller/Invitation.pm index 29049e4..fca4cb3 100644 --- a/lib/Lufi/Controller/Invitation.pm +++ b/lib/Lufi/Controller/Invitation.pm @@ -81,7 +81,7 @@ sub send_invite { ldap_user => ucfirst($invitation->ldap_user), url => $url, invitation => $invitation, - expires => time2str($c->l('%A %d %B %Y at %T'), $invitation->expire_at) + expires => $c->get_date_lang()->time2str($c->l('%A %d %B %Y at %T'), $invitation->expire_at) ); push @success, $c->l('Invitation sent to %1.
URL: %2', $invitation->guest_mail, $url); @@ -156,7 +156,7 @@ sub resend_invitations { my $from = ($c->config('invitations')->{'send_invitation_with_ldap_user_mail'}) ? $i->ldap_user_mail : $c->config('mail_sender'); my $url = $c->url_for('guest', token => $i->token)->to_abs; - my $expire = time2str($c->l('%A %d %B %Y at %T'), $i->expire_at); + my $expire = $c->get_date_lang()->time2str($c->l('%A %d %B %Y at %T'), $i->expire_at); $c->mail( from => $from, to => $i->guest_mail,