[Fusionforge-commits] FusionForge branch feature/taskboard-plugin updated. 0b8782a31c4b0362b70c6406a859daa298056384

Roland Mas lolando at fusionforge.org
Fri Mar 13 14:59:29 CET 2015


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, feature/taskboard-plugin has been updated
       via  0b8782a31c4b0362b70c6406a859daa298056384 (commit)
       via  9a8d66420a840512d1907f09bd08cfa08dec97de (commit)
       via  f28c7d11079ea55fa1769b6b0aa35af04ea175af (commit)
       via  3a2b67c7a78330834748d253dcde99f1e12dcd8d (commit)
       via  bb73eb4b712d494f7bc62ca2c6ef01bcd28bc4ee (commit)
       via  646522613b3e15a844b78f544996a41dc3116b6f (commit)
       via  79e4a8d5be31bb6a96e7a11640c35d03fe820bb0 (commit)
       via  df0a25954e1de76df2af858d3187aa9bdcaa2f7e (commit)
       via  91014ebd9e05a4dfe97d609a78563f20b77f405a (commit)
       via  4fff9f6d6befff61f18cea98ceba91dd3ea52851 (commit)
       via  bf825b5a8642a1f0e53d589a1bac2e18afb4a1cf (commit)
       via  479c6c81c1f21637d2ac511f991d8fe3d4c80df6 (commit)
       via  58e33da7716d646a8952332463bb0bbc0434049a (commit)
       via  2998a5a57e4145408fbcb385f20c5de9f0b81a5b (commit)
       via  c2f4cb009df3e86c96204b96bff83d596f183bbe (commit)
       via  9617029042ed1462d332631f44562b5289db1143 (commit)
       via  e6d4871b0944681bd01a5755d56bed3c709d4c09 (commit)
       via  a4d1a64eaac34e12279b3d9c7d9bd7d40ddd8f5c (commit)
       via  d5f9352f736cf1cb1532dcd40ac323474350abad (commit)
       via  407dbf558b81f14b80f91cfe76af9ee3b4198f18 (commit)
       via  e1eace58cc372d6da947e129dd1e8adf04a79352 (commit)
       via  e81845085f248eb31e2e6aa8436409a47fc2793c (commit)
       via  bd92646308022dd716d2c0e3464b65fc16458846 (commit)
       via  ec94b0a24360dd09cd44290581c69f12145214e4 (commit)
       via  49f458908fa0d378dcc29c5c361ece044df3c026 (commit)
       via  b99a36a8fac6531ea821244fe695e140d957752a (commit)
       via  f8de96da516e8bfc128bcfa0b9dc0c6ab25edc75 (commit)
       via  66c704c5ebc0e0bf31e68b460b7d4ca4ec5c8a50 (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  8c739711d2e133b54e55d5ed3b930d16afbed0c5 (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 0b8782a31c4b0362b70c6406a859daa298056384
Merge: 9a8d664 f28c7d1
Author: Roland Mas <lolando at debian.org>
Date:   Fri Mar 13 14:59:04 2015 +0100

    Merge branch '6.0' into feature/taskboard-plugin

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)

commit 9a8d66420a840512d1907f09bd08cfa08dec97de
Author: Roland Mas <lolando at debian.org>
Date:   Fri Mar 13 14:53:29 2015 +0100

    Install taskboard plugin by default

diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index 73549ed..fa33e06 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -56,11 +56,11 @@ fi
     make install-base install-shell \
         install-plugin-scmsvn install-plugin-scmgit \
         install-plugin-blocks install-plugin-mediawiki install-plugin-moinmoin \
-        install-plugin-online_help
+        install-plugin-online_help install-plugin-taskboard
     make post-install-base post-install-shell \
         post-install-plugin-scmsvn post-install-plugin-scmgit \
         post-install-plugin-blocks post-install-plugin-mediawiki post-install-plugin-moinmoin \
-        post-install-plugin-online_help
+        post-install-plugin-online_help post-install-plugin-taskboard
 )
 
 # Dump clean DB
diff --git a/autoinstall/install.sh b/autoinstall/install.sh
index 2de190d..011e276 100755
--- a/autoinstall/install.sh
+++ b/autoinstall/install.sh
@@ -42,7 +42,7 @@ if [ -e /etc/debian_version ]; then
 	$APT install fusionforge-shell \
 	    fusionforge-plugin-scmgit fusionforge-plugin-scmsvn fusionforge-plugin-scmbzr \
 	    fusionforge-plugin-mediawiki fusionforge-plugin-moinmoin \
-	    fusionforge-plugin-blocks
+	    fusionforge-plugin-blocks fusionforge-plugin-taskboard
 	if ! dpkg-vendor --is Ubuntu; then
 	    apt-get install locales-all  # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
 	fi
@@ -57,6 +57,6 @@ else
 	yum install -y fusionforge fusionforge-shell \
 	    fusionforge-plugin-scmgit fusionforge-plugin-scmsvn \
 	    fusionforge-plugin-mediawiki \
-	    fusionforge-plugin-blocks fusionforge-plugin-online_help
+	    fusionforge-plugin-blocks fusionforge-plugin-online_help fusionforge-plugin-taskboard
     fi
 fi

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

Summary of changes:
 autoinstall/install-src.sh                         |    8 +-
 autoinstall/install.sh                             |    4 +-
 autoinstall/uninstall.sh                           |    1 +
 src/CHANGES                                        |    6 +-
 src/GNUmakefile                                    |    7 +-
 src/bin/systasksd                                  |    2 +
 src/common/docman/DocumentManager.class.php        |    6 +-
 src/common/include/RBAC.php                        |   14 +-
 src/common/include/SysTasksQ.class.php             |   50 +-
 src/common/include/config.php                      |   13 -
 src/common/include/cron_utils.php                  |   37 +-
 src/common/include/plugins_utils.php               |   24 +
 src/common/include/pre.php                         |   14 +-
 src/common/include/utils.php                       |    2 +-
 src/common/robots/scm.txt                          |    4 +
 src/cronjobs/web-vhosts/create_vhosts.php          |    1 -
 src/db/20141210-systasks.sql                       |    2 +-
 src/debian/fusionforge-web.postinst                |    9 +-
 src/debian/fusionforge-web.postrm                  |   46 --
 src/debian/plugin.postinst                         |    9 +-
 src/debian/plugin.postrm                           |   24 -
 src/debian/plugins                                 |    2 +-
 src/etc/config.ini.d/defaults.ini                  |    1 +
 .../httpd.conf.d/01-namevhost.conf                 |    0
 .../httpd.conf.d/02-config-main.conf               |    6 +-
 src/etc/httpd.conf.d/04-config-vendor.conf         |   10 +
 src/etc/httpd.conf.d/05-config-macros-scm.conf     |   16 +
 src/etc/httpd.conf.d/10-vhosts-main.conf           |   18 +
 src/etc/httpd.conf.d/20-vhosts-lists.conf          |   15 +
 src/etc/httpd.conf.d/20-vhosts-scm.conf            |   25 +
 src/etc/httpd.conf.d/30-vhosts-projects.conf       |   16 +
 src/etc/httpd.conf.d/40-vhosts-extra.conf          |    2 +
 src/etc/httpd.conf.d/50-vhosts-scm.conf            |   19 +
 src/{templates => etc}/httpd.conf.d/auth-main.inc  |    0
 .../httpd.conf.d/auth-projects.inc                 |    0
 .../httpd.conf.d/block-trace.inc                   |    0
 src/etc/httpd.conf.d/disable-scripts.inc           |   22 +
 src/{templates => etc}/httpd.conf.d/httpd.vhosts   |    0
 src/{templates => etc}/httpd.conf.d/log.inc        |    4 +-
 src/etc/httpd.conf.d/plugin-generic.inc            |    4 +
 .../httpd.conf.d/projects-in-mainvhost.inc         |    8 +-
 src/{templates => etc}/httpd.conf.d/ssl-off.inc    |    0
 src/{templates => etc}/httpd.conf.d/ssl-on-scm.inc |    4 +-
 src/{templates => etc}/httpd.conf.d/ssl-on.inc     |    4 +-
 .../httpd.conf.d/ssl-really-on.inc                 |    4 +-
 src/etc/httpd.conf.d/vhost-list.inc                |   13 +
 src/etc/httpd.conf.d/vhost-main.inc                |   62 ++
 src/etc/httpd.conf.d/vhost-projects.inc            |   29 +
 src/etc/httpd.conf.d/vhost-scm.inc                 |   61 ++
 .../etc/httpd.conf.d/plugin-authhttpd.inc          |    4 +-
 .../etc/httpd.conf.d/plugin-mediawiki.inc          |   18 +-
 .../etc/httpd.conf.d/50-wsgi-moinmoin.conf         |    2 +-
 .../moinmoin/etc/httpd.conf.d/plugin-moinmoin.inc  |    4 +-
 .../etc/httpd.conf.d/plugin-phpcaptcha.inc         |    2 +-
 .../scmbzr/etc/httpd.conf.d/50-wsgi-scmbzr.conf    |    2 +-
 .../scmbzr/etc/httpd.conf.d/plugin-scmbzr.inc      |   13 +-
 .../scmdarcs/etc/httpd.conf.d/plugin-scmdarcs.inc  |   10 +-
 src/plugins/scmgit/common/GitPlugin.class.php      |  370 ++++-------
 .../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 +-
 src/plugins/scmsvn/common/SVNPlugin.class.php      |   76 +--
 .../etc/httpd.conf.d/05-config-macros-scmsvn.conf  |   26 +-
 .../scmsvn/etc/httpd.conf.d/plugin-scmsvn.inc      |   29 +-
 .../etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc   |   38 +-
 src/plugins/scmsvn/etc/scmsvn.ini                  |    2 +
 src/plugins/scmsvn/libexec/viewvc.cgi              |   90 +++
 src/plugins/scmsvn/www/redirect-to-itk.php         |   50 ++
 .../httpd.conf.d/plugin-sysauthldap-secrets.inc    |    2 +-
 src/post-install.d/common/plugin.sh                |   26 +-
 src/post-install.d/web/expand-conf.php             |   55 --
 src/post-install.d/web/web.sh                      |   47 +-
 src/rpm/plugins                                    |    2 +-
 src/templates/httpd.conf                           |    2 -
 src/templates/httpd.conf.d/04-config-vendor.conf   |   10 -
 src/templates/httpd.conf.d/10-vhosts-main.conf     |   18 -
 src/templates/httpd.conf.d/20-vhosts-lists.conf    |   15 -
 src/templates/httpd.conf.d/20-vhosts-scm.conf      |   19 -
 src/templates/httpd.conf.d/30-vhosts-projects.conf |   16 -
 src/templates/httpd.conf.d/40-vhosts-extra.conf    |    2 -
 src/templates/httpd.conf.d/50-vhosts-scm.conf      |   19 -
 src/templates/httpd.conf.d/plugin-generic.inc      |   32 -
 .../httpd.conf.d/post-install-secrets.inc          |   23 -
 src/templates/httpd.conf.d/vhost-list.inc          |   13 -
 src/templates/httpd.conf.d/vhost-main.inc          |   50 --
 src/templates/httpd.conf.d/vhost-projects.inc      |   29 -
 src/templates/httpd.conf.d/vhost-scm.inc           |   18 -
 src/templates/httpd.vhosts.tmpl                    |    8 +-
 .../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/docman/scripts/DocManController.js         |    6 +-
 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 +-
 tests/func/.gitignore                              |    1 +
 tests/func/50_PluginsScmGit/gitSSHTest.php         |    2 +-
 tests/func/50_PluginsScmGit/gitSmartHTTPTest.php   |   19 +-
 tests/func/50_PluginsScmGit/gitWUITest.php         |    6 +-
 tests/func/55_PluginsScmMulti/multiSCMTest.php     |    2 +-
 105 files changed, 2284 insertions(+), 1124 deletions(-)
 create mode 100644 src/common/robots/scm.txt
 delete mode 100644 src/debian/fusionforge-web.postrm
 delete mode 100644 src/debian/plugin.postrm
 rename src/{templates => etc}/httpd.conf.d/01-namevhost.conf (100%)
 rename src/{templates => etc}/httpd.conf.d/02-config-main.conf (70%)
 create mode 100644 src/etc/httpd.conf.d/04-config-vendor.conf
 create mode 100644 src/etc/httpd.conf.d/05-config-macros-scm.conf
 create mode 100644 src/etc/httpd.conf.d/10-vhosts-main.conf
 create mode 100644 src/etc/httpd.conf.d/20-vhosts-lists.conf
 create mode 100644 src/etc/httpd.conf.d/20-vhosts-scm.conf
 create mode 100644 src/etc/httpd.conf.d/30-vhosts-projects.conf
 create mode 100644 src/etc/httpd.conf.d/40-vhosts-extra.conf
 create mode 100644 src/etc/httpd.conf.d/50-vhosts-scm.conf
 rename src/{templates => etc}/httpd.conf.d/auth-main.inc (100%)
 rename src/{templates => etc}/httpd.conf.d/auth-projects.inc (100%)
 rename src/{templates => etc}/httpd.conf.d/block-trace.inc (100%)
 create mode 100644 src/etc/httpd.conf.d/disable-scripts.inc
 rename src/{templates => etc}/httpd.conf.d/httpd.vhosts (100%)
 rename src/{templates => etc}/httpd.conf.d/log.inc (66%)
 create mode 100644 src/etc/httpd.conf.d/plugin-generic.inc
 rename src/{templates => etc}/httpd.conf.d/projects-in-mainvhost.inc (52%)
 rename src/{templates => etc}/httpd.conf.d/ssl-off.inc (100%)
 rename src/{templates => etc}/httpd.conf.d/ssl-on-scm.inc (81%)
 rename src/{templates => etc}/httpd.conf.d/ssl-on.inc (64%)
 rename src/{templates => etc}/httpd.conf.d/ssl-really-on.inc (81%)
 create mode 100644 src/etc/httpd.conf.d/vhost-list.inc
 create mode 100644 src/etc/httpd.conf.d/vhost-main.inc
 create mode 100644 src/etc/httpd.conf.d/vhost-projects.inc
 create mode 100644 src/etc/httpd.conf.d/vhost-scm.inc
 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 100755 src/plugins/scmsvn/libexec/viewvc.cgi
 create mode 100644 src/plugins/scmsvn/www/redirect-to-itk.php
 delete mode 100755 src/post-install.d/web/expand-conf.php
 delete mode 100644 src/templates/httpd.conf
 delete mode 100644 src/templates/httpd.conf.d/04-config-vendor.conf
 delete mode 100644 src/templates/httpd.conf.d/10-vhosts-main.conf
 delete mode 100644 src/templates/httpd.conf.d/20-vhosts-lists.conf
 delete mode 100644 src/templates/httpd.conf.d/20-vhosts-scm.conf
 delete mode 100644 src/templates/httpd.conf.d/30-vhosts-projects.conf
 delete mode 100644 src/templates/httpd.conf.d/40-vhosts-extra.conf
 delete mode 100644 src/templates/httpd.conf.d/50-vhosts-scm.conf
 delete mode 100644 src/templates/httpd.conf.d/plugin-generic.inc
 delete mode 100644 src/templates/httpd.conf.d/post-install-secrets.inc
 delete mode 100644 src/templates/httpd.conf.d/vhost-list.inc
 delete mode 100644 src/templates/httpd.conf.d/vhost-main.inc
 delete mode 100644 src/templates/httpd.conf.d/vhost-projects.inc
 delete mode 100644 src/templates/httpd.conf.d/vhost-scm.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%)
 create mode 100644 tests/func/.gitignore


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list