[freeside-commits] branch master updated. 3eb12bf89853de205ce653388e572a2760a8151f
Ivan
ivan at 420.am
Fri Nov 13 13:07:43 PST 2015
The branch, master has been updated
via 3eb12bf89853de205ce653388e572a2760a8151f (commit)
via 2d3ab45cd0b35cb929198e2ad36a1ec9a3b4d93d (commit)
via 156ce177ef4fb53cfcf688b6127a3c4cff9fb83d (commit)
via b2e889c3bc1b1cb240b1b37f27b4903e6a0c4773 (commit)
from fb5becb1a877994b897e737e983fae2c8da6a5ac (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 3eb12bf89853de205ce653388e572a2760a8151f
Author: Ivan Kohler <ivan at freeside.biz>
Date: Fri Nov 13 13:07:40 2015 -0800
rt 4.2.12
diff --git a/rt/configure b/rt/configure
index 599b464..b118e4f 100755
--- a/rt/configure
+++ b/rt/configure
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Revision.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for RT rt-4.2.11.
+# Generated by GNU Autoconf 2.69 for RT rt-4.2.12.
#
# Report bugs to <rt-bugs at bestpractical.com>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='RT'
PACKAGE_TARNAME='rt'
-PACKAGE_VERSION='rt-4.2.11'
-PACKAGE_STRING='RT rt-4.2.11'
+PACKAGE_VERSION='rt-4.2.12'
+PACKAGE_STRING='RT rt-4.2.12'
PACKAGE_BUGREPORT='rt-bugs at bestpractical.com'
PACKAGE_URL=''
@@ -1324,7 +1324,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures RT rt-4.2.11 to adapt to many kinds of systems.
+\`configure' configures RT rt-4.2.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1385,7 +1385,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of RT rt-4.2.11:";;
+ short | recursive ) echo "Configuration of RT rt-4.2.12:";;
esac
cat <<\_ACEOF
@@ -1501,7 +1501,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-RT configure rt-4.2.11
+RT configure rt-4.2.12
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1518,7 +1518,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by RT $as_me rt-4.2.11, which was
+It was created by RT $as_me rt-4.2.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -1875,7 +1875,7 @@ rt_version_major=4
rt_version_minor=2
-rt_version_patch=11
+rt_version_patch=12
test "x$rt_version_major" = 'x' && rt_version_major=0
test "x$rt_version_minor" = 'x' && rt_version_minor=0
@@ -3662,7 +3662,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by RT $as_me rt-4.2.11, which was
+This file was extended by RT $as_me rt-4.2.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3715,7 +3715,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-RT config.status rt-4.2.11
+RT config.status rt-4.2.12
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/rt/share/html/Elements/CryptStatus b/rt/share/html/Elements/CryptStatus
index b022b10..f2411a5 100644
--- a/rt/share/html/Elements/CryptStatus
+++ b/rt/share/html/Elements/CryptStatus
@@ -147,7 +147,7 @@ foreach my $run ( @runs ) {
push @messages, {
Tag => $protocol,
Classes => [qw/keycheck bad/],
- Value => loc( "Public key '0x[_1]' is required to verify signature", $line->{'Key'} ),
+ Value => $m->interp->apply_escapes( loc( "Public key '0x[_1]' is required to verify signature", $line->{'Key'} ), 'h'),
};
}
}
@@ -156,21 +156,21 @@ foreach my $run ( @runs ) {
push @messages, {
Tag => $protocol,
Classes => ['passphrasecheck', lc $line->{Status}],
- Value => loc( $line->{'Message'} ),
+ Value => $m->interp->apply_escapes( loc( $line->{'Message'} ), 'h'),
};
}
elsif ( $line->{'Operation'} eq 'Decrypt' ) {
push @messages, {
Tag => $protocol,
Classes => ['decrypt', lc $line->{Status}],
- Value => loc( $line->{'Message'} ),
+ Value => $m->interp->apply_escapes( loc( $line->{'Message'} ), 'h'),
};
}
elsif ( $line->{'Operation'} eq 'Verify' ) {
push @messages, {
Tag => $protocol,
Classes => ['verify', lc $line->{Status}, 'trust-'.($line->{Trust} || 'UNKNOWN')],
- Value => loc( $line->{'Message'} ),
+ Value => $m->interp->apply_escapes( loc( $line->{'Message'} ), 'h'),
};
}
else {
@@ -178,7 +178,7 @@ foreach my $run ( @runs ) {
push @messages, {
Tag => $protocol,
Classes => [lc $line->{Operation}, lc $line->{Status}],
- Value => loc( $line->{'Message'} ),
+ Value => $m->interp->apply_escapes( loc( $line->{'Message'} ), 'h'),
}
}
}
diff --git a/rt/share/static/js/util.js b/rt/share/static/js/util.js
index b665c0e..f6f5c3b 100644
--- a/rt/share/static/js/util.js
+++ b/rt/share/static/js/util.js
@@ -277,7 +277,7 @@ function toggle_addprincipal_validity(input, good, title) {
function update_addprincipal_title(title) {
var h3 = jQuery("#acl-AddPrincipal h3");
- h3.html( h3.text().replace(/: .*$/,'') + ": " + title );
+ h3.text( h3.text().replace(/: .*$/,'') + ": " + title );
}
// when a value is selected from the autocompleter
commit 2d3ab45cd0b35cb929198e2ad36a1ec9a3b4d93d
Merge: 156ce17 fb5becb
Author: Ivan Kohler <ivan at freeside.biz>
Date: Fri Nov 13 13:06:00 2015 -0800
Merge branch 'master' of git.freeside.biz:/home/git/freeside
commit 156ce177ef4fb53cfcf688b6127a3c4cff9fb83d
Author: Ivan Kohler <ivan at freeside.biz>
Date: Fri Nov 13 13:05:54 2015 -0800
no need for runtime dep on Net::OpenSSH
diff --git a/FS/FS/part_export/cardfortress.pm b/FS/FS/part_export/cardfortress.pm
index 154f979..8c94135 100644
--- a/FS/FS/part_export/cardfortress.pm
+++ b/FS/FS/part_export/cardfortress.pm
@@ -4,6 +4,7 @@ use strict;
use base 'FS::part_export';
use vars qw( %info );
use String::ShellQuote;
+use Net::OpenSSH;
#tie my %options, 'Tie::IxHash';
#;
@@ -21,8 +22,6 @@ sub rebless { shift; }
sub _export_insert {
my($self, $svc_acct) = (shift, shift);
- eval "use Net::OpenSSH;";
- return $@ if $@;
open my $def_in, '<', '/dev/null' or die "unable to open /dev/null";
my $ssh = Net::OpenSSH->new( $self->machine,
@@ -61,9 +60,6 @@ sub _export_delete {
#well, we're just going to disable them for now, but there you go
- eval "use Net::OpenSSH;";
- return $@ if $@;
-
open my $def_in, '<', '/dev/null' or die "unable to open /dev/null";
my $ssh = Net::OpenSSH->new( $self->machine,
default_stdin_fh => $def_in );
commit b2e889c3bc1b1cb240b1b37f27b4903e6a0c4773
Author: Ivan Kohler <ivan at freeside.biz>
Date: Fri Nov 13 13:05:47 2015 -0800
spelling
diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html
index 7e5bb1e..18a84e8 100644
--- a/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@ -63,7 +63,7 @@ GmbH, licensed under the terms of the GNU GPL.
<P>
Latex invoice template based on a template from eBills
<http://ebills.sourceforge.net/> by Mark Asplen-Taylor <mark at asplen.co.uk>,
-licensed under the terms fo the GNU GPL.
+licensed under the terms of the GNU GPL.
<P>
Contains "JS Calendar" <http://dynarch.com/mishoo/calendar.epl>
-----------------------------------------------------------------------
Summary of changes:
FS/FS/part_export/cardfortress.pm | 6 +-----
httemplate/docs/license.html | 2 +-
rt/configure | 20 ++++++++++----------
rt/share/html/Elements/CryptStatus | 10 +++++-----
rt/share/static/js/util.js | 2 +-
5 files changed, 18 insertions(+), 22 deletions(-)
More information about the freeside-commits
mailing list