[Fusionforge-commits] FusionForge branch master updated. d4b0c4306ff6de737c078487eece0480ea12cc18

Franck VILLAUME nerville at fusionforge.org
Thu Jan 23 21:12:13 CET 2014


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 "FusionForge".

The branch, master has been updated
       via  d4b0c4306ff6de737c078487eece0480ea12cc18 (commit)
       via  965e49e33034971b0a9f359a1e909ec2419f9178 (commit)
       via  e4abb5fff1fca36aeaf1bd716cfd643de4aaab19 (commit)
       via  4e390e7cac608cdb4130f1fee6c77808f704d73d (commit)
       via  20734aceb20dd8642eb636586bfa6fb606174149 (commit)
       via  ac7db01bb5f9734c4ff83003cfff3896efff8284 (commit)
       via  3316f7d4e9a0eb5c1ba1980f6bf910c7652c3aa3 (commit)
       via  6aa3d99fbf63d5ddc0a53a8cc0882b2ada688640 (commit)
       via  404c5abb013431888ce17384568daf176cf62f85 (commit)
       via  b0fdf40ddb0a0875e7c45c8d7084381acb224205 (commit)
       via  1d4f0e915352915ed9d69983cb6745f4b79d78a0 (commit)
      from  57d2d5d98b8736c7e29d4a1d547fa06a9667fada (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 d4b0c4306ff6de737c078487eece0480ea12cc18
Merge: 57d2d5d 965e49e
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Jan 23 21:10:17 2014 +0100

    Merge branch 'Branch_5_3'

diff --cc src/common/include/account.php
index 635fdf6,e525c90..1900f4d
--- a/src/common/include/account.php
+++ b/src/common/include/account.php
@@@ -281,9 -283,9 +283,9 @@@ function account_shellselects($current
  }
  
  /**
-  * account_user_homedir() - Returns full path of user home directory
+  * account_user_homedir - Returns full path of user home directory
   *
 - * @param	string	The username
 + * @param	string	$user	The username
   * @return	string	home directory path
   */
  function account_user_homedir($user) {
@@@ -292,9 -294,9 +294,9 @@@
  }
  
  /**
-  * account_group_homedir() - Returns full path of group home directory
+  * account_group_homedir - Returns full path of group home directory
   *
 - * @param	string	The group name
 + * @param	string	$group	The group name
   * @return	string	home directory path
   */
  function account_group_homedir($group) {

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

Summary of changes:
 src/common/docman/Document.class.php     |   12 ++++---
 src/common/include/AuthPlugin.class.php  |   29 ++++++++---------
 src/common/include/Group.class.php       |    4 +--
 src/common/include/Navigation.class.php  |   39 ++++++++++++++---------
 src/common/include/RBAC.php              |   50 ++++++++++++++++--------------
 src/common/include/UserManager.class.php |    8 ++---
 src/common/include/account.php           |   42 +++++++++++++------------
 7 files changed, 102 insertions(+), 82 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list