[Fusionforge-commits] FusionForge branch master updated. d328a4ba108681f5b419be6a5fe3c481727fd9ba

Sylvain Beucler beuc-inria at fusionforge.org
Mon Dec 15 15:35:47 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  d328a4ba108681f5b419be6a5fe3c481727fd9ba (commit)
       via  282d9aff2469b628689596202c61929aef364453 (commit)
       via  b72fdd967f573ee1287a87811b06bae9bd142c53 (commit)
       via  d1f09e9a3ab25f60c2af412b50ad467087220464 (commit)
       via  393bb8ba1af2a26629a177eeb4fcf07c313bb16e (commit)
       via  c910f7425764cd97e4627571c2f2b9314fc48b2d (commit)
       via  04c78afceca28aaf42f292f1e4fe525f576ef810 (commit)
       via  dacf456c60dfb4f3b049a4b01268cf55da1c9c7f (commit)
       via  2f6dc28d1c3658779dbfbe2ad3ccf8f7cf1de29a (commit)
       via  d8468f7d0a1b2f070345ed0bb6a6147b7688b23f (commit)
       via  27c472decb2bed4bbc87511c2262d6ff46beaa3f (commit)
       via  c108fdc20a2e0f078c8f30c8eee52d92dc460ed3 (commit)
       via  31a40fc6ecc413ac4d7c2c74fcac21b4767d457a (commit)
       via  d9dc226373ad5661ad733c2cc75baac7c555765f (commit)
       via  767042d5f7900793e0c7edd91b9f43a6868b68b6 (commit)
       via  46b7878cf07b162d56ba45b5d43cf644dbcb76c9 (commit)
       via  683bc9043d0becd0156e06b895da9f25c2a6cfa5 (commit)
       via  1ae94fa52f0156ac787c9441d395de1d790b6f7c (commit)
       via  086190a38441abe1583d6f72a093036952bd3f8c (commit)
       via  70724eec33477d13e21075df8e93689585240b15 (commit)
       via  5a77d5b1d3a0573e82d8ca37f0c207d906dd093a (commit)
       via  ee051b8230b9db1e511ce94364488de81e767089 (commit)
       via  fdcd9b083ccd66041ba013102bbcee18f61bcfb8 (commit)
       via  d60c6855056dd507df091c9862f73c5cac1c9e46 (commit)
       via  c5781b5eaa25d47d10f087dcfa434eb1f1a3e64a (commit)
       via  0be7f1f48ee9f498c9f929ceca2f514a1bcd4f57 (commit)
       via  a618c6cd83c8ab1c6fc3b310035f59dc31df3ecf (commit)
      from  6ef9227e7717475ef290c52c9c4b42841048b6d6 (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 d328a4ba108681f5b419be6a5fe3c481727fd9ba
Merge: 6ef9227 282d9af
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Dec 15 15:35:05 2014 +0100

    Merge remote-tracking branch 'origin/Branch_5_3'
    
    Conflicts:
    	src/debian/fusionforge-plugin-mediawiki.triggers
    	src/install/install3
    	tests/buildbot/common-functions
    	tests/func/vncxstartsuite.sh
    	tests/scripts/fusionforge-build-and-test-rpm.sh
    	tests/scripts/fusionforge-build-and-test-src-cos.sh
    	tests/scripts/phpunit.sh

diff --cc src/CHANGES
index cbba555,b180724..19c36ba
--- a/src/CHANGES
+++ b/src/CHANGES
@@@ -1,34 -1,6 +1,35 @@@
 +Fusionforge-X.X:
 +* [#658] Docman: Basic Webdav write mkcol, delete, put, move support (TrivialDev)
 +* [#657] Docman: Add move mass actions (TrivialDev)
 +* [#747] Docman: Direct link to file details (TrivialDev)
 +* [#692] FRS: Reorganise code (TrivialDev)
 +* [#697] FRS: Enable widget "My monitored packages" (TrivialDev)
 +* [#705] FRS: Provide new role settings (TrivialDev)
 +* [#713] FRS: Add delete packages, releases or files mass action (TrivialDev)
 +* [#737] FRS: Provide link to download any release as ZIP file (TrivialDev)
 +* [#656] General: drop tipsy plugin, use standard jQuery UI tooltip already provided (TrivialDev)
 +* [#663] General: FusionForge Theme & jQuery UI theme sync (TrivialDev)
 +* [#664] General: Update the jQuery & jQuery UI frameworks (TrivialDev)
 +* [#669] General: feedback, error_msg, warning_msg are now store in cookie. (TrivialDev)
 +* [#716] General: Update the jQuery Auto-height plugin (TrivialDev)
 +* Plugin scmhook: Update git post-receive eMail hook (tarent solutions GmbH, Teckids e.V.)
 +* [#684] Widget Public Area: display FRS link (TrivialDev)
 +* [#743] Widget My Latest Commits: New widget to display user commits on "My Page"
 +         Widget Project Latest Commits: New widget to display the 5 latest commits on the project page  (TrivialDev)
 +* [#745] Widget Project Latest Documents: enhancement, add actions buttons (monitor, delete) (TrivialDev)
 +* [#655] Tracker: enable support for multi-select extrafield in roadmap (TrivialDev)
 +* [#662] Forum: store the attached file on FS. (TrivialDev)
 +* [#719] Plugin SCM GIT: activity log entry link to commit log in SCM browsing tab (TrivialDev)
 +* [#724] Plugin SCM HG (Mercurial): display the Repository History stats block (TrivialDev)
 +* [#725] Plugin SCM HG (Mercurial): add support for project activity tab (TrivialDev)
 +* [#726] Plugin SCM HG (Mercurial): activity log entry link to commit log in SCM browsing tab (TrivialDev)
 +* [#734] Plugin AuthLDAP: support LPAP_OPT_REFERRALS option, needed by ActiveDirectory Server (TrivialDev)
 +* [#751] SCM: Allow projects to use several SCM engines in parallel (Roland Mas, for CEA)
 +* [#749] Docman: Rewrite parser using unoconv, support more file formats (Roland Mas, for CEA)
 +
  Fusionforge-5.3.3:
- * User e-mail change: simplify confirmation hash to avoid mangling in some versions of Thunderbird [#738] (Inria)
+ * User e-mail change: simplify confirmation hash and precise encoding to avoid mangling in some versions of Thunderbird and Apple Mail [#738] (Inria)
+ * Project homepage: default to http:// rather than https:// for external homepage links [#752] (Inria)
  * SCM: use 'shell_host' variable (or failing that, 'web_host') to document where users can SSH to the group shared directory [#698] (Inria)
  * SCM stats: fix order in stats block [#736] (TrivialDev)
  * System replication: refresh nscd cache before applying changes
diff --cc src/debian/fusionforge-plugin-mediawiki.triggers
index c26b041,0000000..0d90c6f
mode 100644,000000..100644
--- a/src/debian/fusionforge-plugin-mediawiki.triggers
+++ b/src/debian/fusionforge-plugin-mediawiki.triggers
@@@ -1,3 -1,0 +1,3 @@@
 +# Triggers for fusionforge-plugin-mediawiki
- interest /usr/share/mediawiki
- interest /usr/share/mediawiki-extensions
++interest-noawait /usr/share/mediawiki
++interest-noawait /usr/share/mediawiki-extensions

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

Summary of changes:
 src/CHANGES                                      |    3 ++-
 src/common/include/Group.class.php               |    2 +-
 src/common/include/utils.php                     |    1 +
 src/common/mail/Mail.class.php                   |    1 +
 src/debian/fusionforge-plugin-mediawiki.triggers |    4 ++--
 5 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list