From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7902d679eb78223c61525c4918912a141d134c0a
Date: Wed, 10 Jan 2018 16:45:56 +0000 [thread overview]
Message-ID: <20180110164557.5FB4D1081BD8@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2654 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 7902d679eb78223c61525c4918912a141d134c0a (commit)
via bf1db4b28fa2ab0c7e3113ab87779bfa583a8c08 (commit)
from bca3f3bdbfd9e3e2909c90b90843284177da2435 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7902d679eb78223c61525c4918912a141d134c0a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jan 10 16:44:53 2018 +0000
core118: Ship modified captive.cgi
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bf1db4b28fa2ab0c7e3113ab87779bfa583a8c08
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Wed Jan 10 17:04:56 2018 +0100
Forgot to change language strings in captive.cgi
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/118/filelists/files | 1 +
html/cgi-bin/captive.cgi | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
Difference in files:
diff --git a/config/rootfiles/core/118/filelists/files b/config/rootfiles/core/118/filelists/files
index 6780a011b..bb02da3aa 100644
--- a/config/rootfiles/core/118/filelists/files
+++ b/config/rootfiles/core/118/filelists/files
@@ -4,6 +4,7 @@ etc/httpd/conf/loadmodule.conf
etc/httpd/conf/vhosts.d/captive.conf
etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
etc/httpd/conf/vhosts.d/ipfire-interface.conf
+srv/web/ipfire/cgi-bin/captive.cgi
srv/web/ipfire/cgi-bin/fireinfo.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index f3bb28cb2..65cc349ba 100755
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -237,7 +237,7 @@ if ($cgiparams{'ACTION'} eq 'delete-client') {
}
#open webpage, print header and open box
-&Header::openpage($Lang::tr{'Captive menu'}, 1, '');
+&Header::openpage($Lang::tr{'Captive'}, 1, '');
&Header::openbigbox();
# If an error message exists, show a box with the error message
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2018-01-10 16:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180110164557.5FB4D1081BD8@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox