[Fusionforge-commits] FusionForge branch master updated. v6.0.3-404-gef421af

Franck Villaume nerville at libremir.placard.fr.eu.org
Tue Mar 15 21:51:58 CET 2016


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  ef421af6530ade911020e70dd45b7fa10a0b8441 (commit)
       via  52a6fd3113602adafc0e8398ab205a029a2af57d (commit)
       via  1c4fde46a8cd1b58a177413e6faf33cee3938571 (commit)
       via  be0d3cb1783f76d0c1631cf18c7c9303b96556f4 (commit)
       via  54b44d70d094ef5e8dfec82dc943f4af4687e9b5 (commit)
       via  d12c6dfd35c2829119e5eb46c4023adf69520e94 (commit)
      from  a66a83d79f178c7300a5c883186c84718f4ea1aa (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ef421af6530ade911020e70dd45b7fa10a0b8441

commit ef421af6530ade911020e70dd45b7fa10a0b8441
Merge: a66a83d 52a6fd3
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Tue Mar 15 21:51:52 2016 +0100

    Merge 6.0

diff --cc src/common/docman/DocumentManager.class.php
index d000390,3a9993d..55579a3
--- a/src/common/docman/DocumentManager.class.php
+++ b/src/common/docman/DocumentManager.class.php
@@@ -232,15 -208,12 +232,16 @@@ class DocumentManager extends Error 
  						}
  						$lititle .= _('Last Modified')._(': ').relative_date($localDg->getLastModifyDate());
  					}
 +					$linkname = $localDg->getName();
 +					if ($localDg->getState() == 5) {
 +						$linkname .= ' '._('(private)');
 +					}
- 					echo html_ao('li', array('id' => 'leaf-'.$subGroupIdValue, 'class' => $liclass)).util_make_link($link, $linkname, array('title'=>$lititle)).$nbDocsLabel;
+ 					//use &nbsp + inline to support Chrome browser correctly
+ 					echo html_ao('li', array('id' => 'leaf-'.$subGroupIdValue, 'class' => $liclass)).' '.util_make_link($link, $localDg->getName(), array('title'=>$lititle, 'style' => 'display: inline')).$nbDocsLabel;
  				} else {
- 					echo html_ao('li', array('id' => 'leaf-'.$subGroupIdValue, 'class' => $liclass)).util_make_link($link, $localDg->getName()).$nbDocsLabel;
+ 					echo html_ao('li', array('id' => 'leaf-'.$subGroupIdValue, 'class' => $liclass)).' '.util_make_link($link, $localDg->getName(), array('style' => 'display: inline')).$nbDocsLabel;
  				}
 -				if ($dg->getSubgroup($subGroupIdValue, $stateId)) {
 +				if ($dg->getSubgroup($subGroupIdValue, $doc_group_stateid)) {
  					echo html_ao('ul', array('class' => 'simpleTreeMenu'));
  					$this->getTree($selecteddir, $linkmenu, $subGroupIdValue);
  					echo html_ac(html_ap() - 1);
diff --cc src/etc/config.ini.d/defaults.ini
index 4377c9a,807702e..8e0e0a9
--- a/src/etc/config.ini.d/defaults.ini
+++ b/src/etc/config.ini.d/defaults.ini
@@@ -57,6 -57,8 +57,7 @@@ use_activity = ye
  use_docman = yes
  use_forum = yes
  use_frs = yes
 -use_fti = yes
+ fti_config = simple
  use_ftp = yes
  use_ftp_uploads = no
  use_gateways = yes

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

Summary of changes:
 src/CHANGES                                        |  1 +
 .../{list-admins.php => rebuild-fti-indices.php}   | 25 +++++++++++++++++-----
 src/common/docman/DocumentManager.class.php        |  7 +++---
 src/common/include/database-pgsql.php              |  2 +-
 src/etc/config.ini.d/defaults.ini                  |  1 +
 src/plugins/scmcvs/bin/install.sh                  |  6 ------
 src/plugins/scmsvn/common/SVNPlugin.class.php      |  7 ++----
 7 files changed, 29 insertions(+), 20 deletions(-)
 copy src/bin/{list-admins.php => rebuild-fti-indices.php} (62%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list