[Fusionforge-commits] FusionForge branch master updated. v6.1beta1-72-gfebac4a

Franck Villaume nerville at libremir.placard.fr.eu.org
Sat Dec 30 16:43:16 CET 2017


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  febac4ac1f81941e7d7cb54c9998b4b59cbcbdf3 (commit)
       via  dfb105b0bef8fafa42079e1fee42810bc776b78e (commit)
       via  b815f2f9db58baa911fca50372ae2c1eea951e18 (commit)
       via  559dd7aa4e7f3e5d4b519d83d7d897226fdc27f6 (commit)
       via  cd681482f8d37f84a29b18426977a29bf9244b0f (commit)
       via  becc218b1876f7a11f2d3fdfa8a52564c47237da (commit)
       via  d9219073e0eea546c66307043601e2667290b137 (commit)
       via  a587ed02922b6f19d5cc3b01790973f7a79cc05a (commit)
       via  6b5022cd32562968958a8d09496e465ea983c071 (commit)
       via  8f43bf34d808a30a4089049346eebcefb47d5c3b (commit)
       via  0283a7e3fba3cd58836abe20a7a115a4e9eee947 (commit)
       via  19f4dec796bb8d4a7bf799501488792387dd2790 (commit)
       via  2873182e0b3e2f4c36b763d29808e861e34271ca (commit)
       via  e0bae14ad4b99244183002537ab24235a0b268ec (commit)
       via  9ac7e465bb4af87141d2c40b7f042b014caf8fac (commit)
       via  db0801d202f841dd75e6b451c5f0fa8796b4bdba (commit)
       via  e233fb7b0abb3841bc77661fc0640a933f343531 (commit)
       via  fb4e65193923873ec7651757b5a4b5d70e108914 (commit)
       via  b20706d9045a306129c6358be5413f032e388f00 (commit)
       via  4ff2270ea4f29daa5550a38a0d91ad4fddfad6d7 (commit)
       via  3dc586bf7be9e2bf2102fc145945e492088ce64f (commit)
       via  7073be5850a6b96e1be8d4be4011e922c5f1a48c (commit)
       via  57cd43b8fb892de28fc275aed16967ddd3e165fd (commit)
       via  cce47c31aef2baa6236f9a03e4ca40f3b5d0a097 (commit)
       via  f338cb72850554f3cc8eed02ae76f1882b8e7ad6 (commit)
       via  8494eeabdddc5e8f701e028fe910e29357958ade (commit)
       via  a522da06ed5597a3443b78db0eee0eab0e046b83 (commit)
       via  6085a0a729de3f9f4c5b1b95b81d3aa52a9f92a5 (commit)
       via  acb88aaacfb0957884e4ee65623bdf02765553e6 (commit)
       via  58487af3256cbdc14c8fc9953d9d222f7c5363b3 (commit)
       via  17b5a6b5176a18ffde12974353253d72e1b9bca0 (commit)
      from  7d0e79b57d7ae4158faf66b6ba4301d4f2666a50 (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=febac4ac1f81941e7d7cb54c9998b4b59cbcbdf3

commit febac4ac1f81941e7d7cb54c9998b4b59cbcbdf3
Merge: 7d0e79b dfb105b
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Dec 30 16:43:06 2017 +0100

    Merge 6.1

diff --cc src/common/widget/Widget_ProjectPublicAreas.class.php
index dc43d4e,24df553..4d8847b
--- a/src/common/widget/Widget_ProjectPublicAreas.class.php
+++ b/src/common/widget/Widget_ProjectPublicAreas.class.php
@@@ -121,11 -121,13 +121,13 @@@ class Widget_ProjectPublicAreas extend
  
  		if ($project->usesDocman()) {
  			$result .= '<div class="public-area-box">';
 -			$link_content = $HTML->getDocmanPic('') . ' ' . _('Document Manager');
 +			$link_content = $HTML->getDocmanPic() . ' ' . _('Document Manager');
  			//	<a rel="sioc:container_of" xmlns:sioc="http://rdfs.org/sioc/ns#" href="'.util_make_url ('/docman/?group_id='.$group_id).'">';
  			$result .= util_make_link('/docman/?group_id='.$group_id, $link_content);
- 			$docm = new DocumentManager($project);
- 			$result .= ' ('.html_e('strong', array(), $docm->getNbDocs(), true, false).' '._('documents').' '._('in').' '.html_e('strong', array(), $docm->getNbFolders(), true, false).' '._('directories').')';
+ 			if (forge_check_perm('docman', $group_id, 'read')) {
+ 				$docm = new DocumentManager($project);
+ 				$result .= ' ('.html_e('strong', array(), $docm->getNbDocs(), true, false).' '._('documents').' '._('in').' '.html_e('strong', array(), $docm->getNbFolders(), true, false).' '._('directories').')';
+ 			}
  			$result .= '</div>';
  		}
  
diff --cc src/debian/changelog
index 7caa345,63ba86b..80fe1f2
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +fusionforge (6.1.50-0) UNRELEASED; urgency=medium
 +
 +  * New snapshot from master branch.
 +
 + -- Franck Villaume <franck.villaume at trivialdev.com>  Wed, 04 Oct 2017 09:40:00 +0200
 +
+ fusionforge (6.1~beta1) UNRELEASED; urgency=medium
+ 
+   * New snapshot from 6.1 stabilization branch
+ 
+  -- Franck Villaume <franck.villaume at trivialdev.com>  Sun, 10 Dec 2017 08:30:00 +0200
+ 
  fusionforge (6.1~alpha0) UNRELEASED; urgency=medium
  
    * New snapshot from 6.1 stabilization branch

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

Summary of changes:
 autoinstall/install-src.sh                         |    2 +-
 src/bin/forge_set_password                         |   15 +-
 src/bin/inject-files.php                           |  109 +-
 src/bin/inject-groups.php                          |   53 +-
 src/bin/inject-users.php                           |   58 +-
 src/common/docman/DocumentManager.class.php        |    3 +-
 src/common/include/FusionForge.class.php           |    2 +-
 src/common/include/SCMPlugin.class.php             |    2 +-
 src/common/include/system/UNIX.class.php           |   20 +-
 src/common/include/utils.php                       |    7 -
 src/common/tracker/Artifact.class.php              |   39 +-
 src/common/tracker/include/ArtifactHtml.class.php  |    2 +-
 .../tracker/include/ArtifactTypeHtml.class.php     |   29 +-
 src/common/tracker/views/form-workflow.php         |   31 +-
 src/common/widget/WidgetLayout_Row.class.php       |    2 +-
 .../Widget_ProjectLatestFileReleases.class.php     |    5 +-
 .../widget/Widget_ProjectPublicAreas.class.php     |    6 +-
 src/common/widget/Widget_TrackerSummary.class.php  |    2 +-
 src/cronjobs/misc/backup_site.php                  |  103 +-
 src/cronjobs/shell/homedirs.php                    |    6 +-
 src/db/20160627-tracker-autoassign.sql             |    3 +
 ...1208-tracker-artifact-lastmodifieddate-init.sql |   12 +
 src/db/startpoint.php                              |   84 +
 src/debian/changelog                               |    6 +
 src/locale/fusionforge.pot                         | 3973 ++++++++++----------
 src/plugins/scmgit/common/GitPlugin.class.php      |    3 +-
 src/rpm/plugins                                    |    2 +-
 src/www/include/Layout.class.php                   |    5 +-
 src/www/softwaremap/full_list.php                  |   24 +-
 src/www/softwaremap/tag_cloud.php                  |   18 +-
 src/www/themes/funky-wOw/Theme.class.php           |   15 +-
 .../{funky => funky-wOw}/css/theme-pages.css       |   56 +-
 src/www/themes/funky-wOw/css/theme.css             |  655 +++-
 src/www/themes/funky/css/theme-pages.css           |   61 +-
 src/www/themes/funky/css/theme.css                 |  108 +-
 35 files changed, 3209 insertions(+), 2312 deletions(-)
 create mode 100644 src/db/20171208-tracker-artifact-lastmodifieddate-init.sql
 create mode 100755 src/db/startpoint.php
 copy src/www/themes/{funky => funky-wOw}/css/theme-pages.css (81%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list