[Fusionforge-commits] FusionForge branch master updated. dd69b8454ab539ff2c633449da637913f2ba55ea

[Roland Mas]

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  dd69b8454ab539ff2c633449da637913f2ba55ea (commit)
       via  043a4e71c0c338fef057f27627c740e69e2dd666 (commit)
       via  10e8b132e0b33cf61a3cf7fdee3bd140d2f47847 (commit)
       via  7260df05643277bea787c55a6a629bac58164f0f (commit)
       via  8aeafd566e452af7b86a209a06cb56f4defb0a97 (commit)
       via  52204315844333ab45e71fa9944be74b0ec7b06d (commit)
       via  89a197d710021f635eaad3816cc8bead73696aea (commit)
       via  ba8dfce975a6830042d0296f21574105b027f31b (commit)
       via  4941dffd2e47fc48e8c04fe705f9a7cbff1e6f92 (commit)
       via  657bf04a908488aee3f587beff87e7732c5c927e (commit)
       via  13161d66f4e43f1308cfa575dd0997f3a3df395d (commit)
       via  701dafbb5fc62f4f8c977648b7e5ffc626402541 (commit)
       via  e899400f27668c63a8da4d66b96e8bdf2439c992 (commit)
       via  6ec36e01e5ade1e2ea447b7f4d5967cb496ca6c1 (commit)
       via  c1921997fa4feeb569349b8e5b87541869d31692 (commit)
       via  925b586ce10d40bacbadcb703745074d61bce41e (commit)
       via  8a49d506f95efe1544c2ff0bbd84a10ff88ee594 (commit)
       via  9e10069b67f231dc35bb34caff9dc8cb1f6feb15 (commit)
       via  5417f4275ca932fc3b0663660f8859ed82495717 (commit)
       via  51bad1459535b14dc09f52d9c681b58868b7482a (commit)
       via  875dcc88148919928ffb61bc82ad1eee1f5d5fd8 (commit)
       via  35e78b7b3351ed58680703b04a25b0061dbdad63 (commit)
       via  b47ee75c1eb4a39a8b2b35988f63e2fec59655b6 (commit)
       via  40dacc4a0b860e8bda3775f20704d52c3670ea90 (commit)
       via  6260ccec8b459696fa61b8b99a2e82df5ad6e442 (commit)
       via  2cefcf72cd9122297c101da267dd8f716af86728 (commit)
       via  83e5e2349010b147da7be2a5c343f79140ab663d (commit)
       via  cf688c3e46bdcad43464eb5e697dfe4c7725dce3 (commit)
       via  2c98e2eaca6cff1f8da8520980ff4be7b932c57c (commit)
       via  abd4f06ed59f5b60e980e10b0c9c085e9b52ca09 (commit)
       via  54f3889db41307a341d7aacba036d570f6d36b12 (commit)
       via  2f69ab2be27c9b806122c52a8cd8dd5531571feb (commit)
       via  79c2b02baab87224d82e5e084e0e1139c2ef481c (commit)
       via  9bb37b26886e26932ee85f1f40245cc9074b1a86 (commit)
       via  f34a552c7295b0da31e4579ba88327a80e318563 (commit)
       via  db3cfd5349b3ec41ec2b2481cd0d497ebed403a2 (commit)
       via  ef9b40857907a1af2c0ee04a6b78d055121103f0 (commit)
       via  c5e4847ff7aaebe70eb4777d9eaf8b37884c45c3 (commit)
       via  219fc6ea771a11bb8a7ac5028ff8afe856f44dda (commit)
       via  32d8a9785519f2075dd05e01de6dd3b18323c263 (commit)
       via  7a573204c460099483cd0fb31e3e7b643af127ac (commit)
       via  f31ce503f061c302be04d91cc1708c8a388c18d3 (commit)
       via  20b72c5d6b0e5001b9f21752493c65c717e80047 (commit)
       via  6cb71b280410b565bc3398879e9c0eb5698544ce (commit)
       via  36b165d91d54dbf01ddf79ed288bc79e5f0914e9 (commit)
       via  f2b1a2e4e55cd16b891eeca6ce034e7bd6f1882c (commit)
       via  c19760c740e09f5f9882f2e748c44b5814872d4e (commit)
       via  3cbd19e461e05ed7f52314a8afb1222f81e16e14 (commit)
       via  6601c3813d7636c0bcae1664c9b6a0e1ec0a3d2c (commit)
      from  00a55c5b206fedc434a241ffc873548aff0a4761 (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 dd69b8454ab539ff2c633449da637913f2ba55ea
Merge: 00a55c5 043a4e7
Author: Roland Mas <lolando at debian.org>
Date:   Thu Mar 5 15:07:55 2015 +0100

    Merge branch '6.0'

diff --cc src/CHANGES
index 8917705,395a37b..6e763e6
--- a/src/CHANGES
+++ b/src/CHANGES
@@@ -1,9 -1,7 +1,9 @@@
 +Fusionforge-X.X:
 +
  Fusionforge-6.0 (unreleased):
- * New install system [#710] (Inria)
- * Reactivity: system replication is now performed immediately (rather than waiting for cron jobs) (Inria)
- * SCM: concurrent SSH and HTTPS access, relying on Apache mod_itk (Roland Mas)
+ * [#710] New install system (Inria)
+ * [#147] Reactivity: system replication is now performed immediately (rather than waiting for cron jobs) (Inria)
+ * [#519] SCM: concurrent SSH and HTTPS access, relying on Apache mod_itk (Roland Mas)
  * [#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)

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

Summary of changes:
 autoinstall/install-src.sh                         |    4 +-
 src/CHANGES                                        |    6 +-
 src/bin/systasksd                                  |    2 +
 src/common/include/RBAC.php                        |   14 +-
 src/common/include/SysTasksQ.class.php             |   50 +-
 src/common/include/cron_utils.php                  |   37 +-
 src/common/include/plugins_utils.php               |   24 +
 src/common/include/utils.php                       |    2 +-
 src/db/20141210-systasks.sql                       |    2 +-
 src/debian/plugins                                 |    2 +-
 .../scmbzr/etc/httpd.conf.d/plugin-scmbzr.inc      |    5 +
 .../scmdarcs/etc/httpd.conf.d/plugin-scmdarcs.inc  |    5 +
 src/plugins/scmgit/common/GitPlugin.class.php      |  364 +++--------
 .../etc/httpd.conf.d-dav/plugin-scmgit-dav.inc     |   32 -
 .../etc/httpd.conf.d/05-config-macros-scmgit.conf  |   39 --
 .../scmgit/etc/httpd.conf.d/plugin-scmgit.inc      |   40 +-
 .../etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc   |   54 +-
 .../scmgit/www/iframeResizer.contentWindow.html    |    1 +
 src/plugins/scmsvn/common/SVNPlugin.class.php      |   76 +--
 .../etc/httpd.conf.d/05-config-macros-scmsvn.conf  |   24 +-
 .../scmsvn/etc/httpd.conf.d/plugin-scmsvn.inc      |   29 +-
 .../etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc   |   35 +-
 src/plugins/scmsvn/libexec/cgi-bin/viewvc.cgi      |   90 +++
 src/plugins/scmsvn/www/redirect-to-itk.php         |   52 ++
 src/rpm/plugins                                    |    2 +-
 .../httpd.conf.d/05-config-macros-scm.conf         |   16 +
 src/templates/httpd.conf.d/20-vhosts-scm.conf      |    6 +
 src/templates/httpd.conf.d/disable-scripts.inc     |   22 +
 src/templates/httpd.conf.d/plugin-generic.inc      |   28 -
 src/templates/httpd.conf.d/vhost-main.inc          |    8 +-
 src/templates/httpd.conf.d/vhost-scm.inc           |   58 +-
 .../iframe-resizer/iframeResizer.contentWindow.js  |  686 ++++++++++++++++++++
 .../iframeResizer.contentWindow.min.js             |   10 +
 src/vendor/iframe-resizer/iframeResizer.js         |  565 ++++++++++++++++
 src/vendor/iframe-resizer/iframeResizer.min.js     |    9 +
 .../check_forwarded_session.php}                   |   10 +-
 src/www/include/html.php                           |   32 +-
 src/www/reporting/useract.php                      |   44 +-
 src/www/scm/browser.php                            |   13 +-
 src/www/scm/include/viewvc_utils.php               |    1 -
 src/www/scm/viewvc.php                             |   67 +-
 41 files changed, 1941 insertions(+), 625 deletions(-)
 delete mode 100644 src/plugins/scmgit/etc/httpd.conf.d-dav/plugin-scmgit-dav.inc
 delete mode 100644 src/plugins/scmgit/etc/httpd.conf.d/05-config-macros-scmgit.conf
 create mode 100644 src/plugins/scmgit/www/iframeResizer.contentWindow.html
 create mode 100755 src/plugins/scmsvn/libexec/cgi-bin/viewvc.cgi
 create mode 100644 src/plugins/scmsvn/www/redirect-to-itk.php
 create mode 100644 src/templates/httpd.conf.d/05-config-macros-scm.conf
 create mode 100644 src/templates/httpd.conf.d/disable-scripts.inc
 create mode 100644 src/vendor/iframe-resizer/iframeResizer.contentWindow.js
 create mode 100644 src/vendor/iframe-resizer/iframeResizer.contentWindow.min.js
 create mode 100644 src/vendor/iframe-resizer/iframeResizer.js
 create mode 100644 src/vendor/iframe-resizer/iframeResizer.min.js
 copy src/www/{themes/index.php => account/check_forwarded_session.php} (79%)


hooks/post-receive
-- 
FusionForge