[freeside-commits] branch master updated. a2c70ba55a0b69c310534774334d859c2e907692

[Ivan]

The branch, master has been updated
       via  a2c70ba55a0b69c310534774334d859c2e907692 (commit)
       via  656a9b83e02e5eb5aea314b23546b156631ac51a (commit)
       via  f5f6c1b1a622d934b4450e4923f95012c5874098 (commit)
      from  f3145308f69d7d3d42af6132439cff26b4fc9008 (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 a2c70ba55a0b69c310534774334d859c2e907692
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Sep 5 17:19:24 2014 -0700

    show Calling-Station-Id on RADIUS reports (as a MAC address w/vendor), RT#29154

diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index 7ec869c..5a8da7b 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -649,6 +649,8 @@ Returns an arrayref of hashrefs with the following fields:
 
 =item acctoutputoctets
 
+=item callingstationid
+
 =item calledstationid
 
 =back
@@ -692,7 +694,7 @@ sub usage_sessions {
   my @fields = (
                  qw( username realm framedipaddress
                      acctsessiontime acctinputoctets acctoutputoctets
-                     calledstationid
+                     callingstationid calledstationid
                    ),
                  "$str2time acctstarttime ) as acctstarttime",
                  "$str2time acctstoptime ) as acctstoptime",

commit 656a9b83e02e5eb5aea314b23546b156631ac51a
Merge: f5f6c1b f314530
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Sep 5 11:45:48 2014 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit f5f6c1b1a622d934b4450e4923f95012c5874098
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Sep 4 23:59:36 2014 -0700

    credit

diff --git a/FS/FS.pm b/FS/FS.pm
index d6b68c2..ea3b66a 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -616,6 +616,8 @@ Commercial products and services are available; see
 
 Jeremy Davis
 
+Jason Hall
+
 Ivan Kohler
 
 Mark Wells
@@ -626,8 +628,6 @@ Peter Bowen
 
 Jeff Finucane
 
-Jason Hall
-
 Kristian Hoffman
 
 Erik Levinson
diff --git a/httemplate/docs/credits.html b/httemplate/docs/credits.html
index 908f717..158c5ba 100644
--- a/httemplate/docs/credits.html
+++ b/httemplate/docs/credits.html
@@ -17,7 +17,6 @@
 <BR>
 <BR>
 <BR>
-<BR>
 
 <FONT SIZE=6>
   <CENTER>Freeside</CENTER>
@@ -28,10 +27,10 @@
 <H3>version <% $FS::VERSION %></H3>
 
 <BR>
-<BR>
 
 <H3>Core Team</H3>
 Jeremy Davis<BR>
+Jason Hall<BR>
 Ivan Kohler<BR>
 Mark Wells<BR>
 <BR>
@@ -42,7 +41,6 @@ Mark Wells<BR>
 <H3>Core Emeritus</H3>
 Peter Bowen<BR>
 Jeff Finucane<BR>
-Jason Hall<BR>
 Kristian Hoffman<BR>
 Erik Levinson<BR>
 Brian McCane<BR>
@@ -51,6 +49,7 @@ Matt Simerson<BR>
 <BR>
 
 <H3>Contributors</H3>
+C.J. Adams-Collier<BR>
 Stephen Amadei<BR>
 Eric Arvidsson<BR>
 Mark Asplen-Taylor<BR>
@@ -163,7 +162,7 @@ function myHeight() {
         return document.body.document.height;
     else
 */
-        return 1959; // approx height (add more per contributors)
+        return 2300; // approx height (add more per contributors)
 }
 
 document.body.style.overflow = 'hidden';

-----------------------------------------------------------------------

Summary of changes:
 FS/FS.pm                       |    4 ++--
 FS/FS/part_export/sqlradius.pm |    4 +++-
 httemplate/docs/credits.html   |    7 +++----
 3 files changed, 8 insertions(+), 7 deletions(-)