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 56e48db36134c208cd297b5e41b0425748188644 (commit)
via 44ecf6060717cb8a3cc07d0f79fd480a58050cff (commit)
via f912fd6d41ab1b90cdd10d7a141ef2b1cd6d8a38 (commit)
via 91e961c43428eb53bba1685548d2ffd0541bbf44 (commit)
via 67845c33e3cf2d0e8d0170aa0eada51c822ee866 (commit)
via bd9093232fb5d0806359e7cda3a907ae67b5d15f (commit)
via d18019362b5ec5973987d39c2ddf6921f606aeee (commit)
via 191d3fc4700d950bd592d2cf4b5af0a21fb1359a (commit)
via ed8fa7c4995e35afc7bdb51a27fda1a12b0e0f10 (commit)
via 0d01312c1029d7fec9a9ca49afc5108f6dd8e0b8 (commit)
via b32715e145b8679e7a9a1a5ba4e8ee6acb0b2b01 (commit)
via 9f0e4524f3b25e66519cb273e46e3f2e752d31f7 (commit)
via 2a9a66a9e344e057d9e2e899d0b9420196a5e7ae (commit)
via d235264b03104086e4d7e9d268d9ee4fe8b01951 (commit)
via 5bb286ef728ce19ae7da27be4d1116bf2d5c0b77 (commit)
via 3facb9937f3ab7cda452ab9340afd503f8ed11c8 (commit)
via 92c7ac10d6961bb59bd59daf259552f622825c1c (commit)
via 62a44b5c40a4880678315185038c2ca4b6f567a6 (commit)
via 8e847a46b5bc9eb7c7f4275651c6a02629e04df9 (commit)
via c0458dd5bb56738e07cb21da113d21a04b08ca86 (commit)
via ab46112a8ff32ed8c5f4a988145cab65e0083050 (commit)
via 530be9ae129fe75d32dff854728750ca7d7466b5 (commit)
via 26806f2b30bccb64410fed741519aa511a0ffa8b (commit)
via ce990b420eab5d0477a067c21272d01e0c031346 (commit)
via acc15defd3a4401f55a62ffab3bad06bb5376e71 (commit)
via dfd4e45b2cd274965a8c18b313496f2873546ff5 (commit)
via d43d651e12d12652468978ca3ebc66cadc3961f2 (commit)
via eb2d7870f281abb2b035e29454f01534f3f72a85 (commit)
via 7d3d2f397c43e9a7ec1f7dc4c83d8bb6a86235d9 (commit)
via e09cdbf685aaac178c74c24d482f3c1c9311a6f5 (commit)
via c347cbf2e3d8050f9d102b4ea1466e452b3d70e2 (commit)
via b50f481415c9500fc9a35dc0ada123c1b2da722a (commit)
via 8209707e0a80feadd7445abbce1ad5dc1487b6f1 (commit)
via 2c4544cb9c7b4dd88a574bdf395e3643529cb962 (commit)
via da407d1b747ac5297dd1905d75ed9fcc661b3b78 (commit)
via d9a4e1774e85f1d49141fb3eacc8e057ac348c65 (commit)
via b92cd6ec685dfd4de44727d7408a62292183a7df (commit)
via 5627dd6ab315f6878cf188ce7762aa165e478355 (commit)
via e7d568d1b387245b5b2e3afab19d416708943907 (commit)
via 31ac9bf620f7207599ed24cceb8f835563bf376d (commit)
via 425409df907b51b9537571f9fa3184d24321a92e (commit)
via ebe118db4bc1d62f7dd8433aecac4f5a008a8b8e (commit)
via 7a156a3dffa91e2c9932cbdcd8a19bb10eb92efe (commit)
via f96ab7bc37729f1ba42bfe15868d90259afbba6b (commit)
via 5470439c481f79a9411906e30b13ec5ce0021162 (commit)
via bb26f2108a8535f7345c8d4e15ba51fabc9890c9 (commit)
via 36c136e6065f221c346b0a3b1785dfb8147a3528 (commit)
via 3c8d9afe9a4aa62b99e6ae1a0405cc2d94de3cff (commit)
via 9cc7f058436d1630550e0ee4c173f28e1e64cf7b (commit)
via c4a49473e081fe16dcb3dce7d6b0b889f56c606a (commit)
via a08e4909c1623bea37372b6d50cc00f5bd1bdf70 (commit)
via 7d7f6dcb19e9bbbf58d85755e24999e282d87fe3 (commit)
via 486a25f5cf5140ab1608b88198d390514906b48c (commit)
via 34aa48875d381681b531db3dfbd0e02a53668e25 (commit)
from 0b8782a31c4b0362b70c6406a859daa298056384 (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 56e48db36134c208cd297b5e41b0425748188644
Merge: 0b8782a 44ecf60
Author: Franck Villaume <[email protected]>
Date: Sun Apr 5 13:00:03 2015 +0200
Merge 6.0
diff --cc autoinstall/install-src.sh
index 7218a32,da1aaea..cdbffb8
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@@ -53,14 -53,14 +53,14 @@@ f
(
cd $(dirname $0)/../src/
make
- make install-base install-shell \
+ make install-base install-shell install-scm \
install-plugin-scmsvn install-plugin-scmgit \
install-plugin-blocks install-plugin-mediawiki
install-plugin-moinmoin \
- install-plugin-online_help
- make post-install-base post-install-shell post-install-scm \
+ install-plugin-online_help install-plugin-taskboard
- make post-install-base post-install-shell \
++ make post-install-base post-install-shell post-install-scm \
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 --cc autoinstall/install.sh
index 011e276,563672e..b4fc70d
--- a/autoinstall/install.sh
+++ b/autoinstall/install.sh
@@@ -39,10 -39,10 +39,10 @@@ if [ -e /etc/debian_version ]; the
$APT install fusionforge
# Additional components for testsuite
- $APT install fusionforge-shell \
+ $APT install fusionforge-shell fusionforge-scm \
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
@@@ -54,9 -54,9 +54,9 @@@ els
yum upgrade -y
else
# Initial installation
- yum install -y fusionforge fusionforge-shell \
+ yum install -y fusionforge fusionforge-shell fusionforge-scm \
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:
.gitignore | 3 +-
autoinstall/install-src.sh | 4 +-
autoinstall/install.sh | 4 +-
src/CHANGES | 3 +
src/GNUmakefile | 18 +-
src/bin/fix_default_role.php | 5 +-
src/bin/forge | 6 +-
src/bin/forge_make_admin | 4 +-
src/bin/forge_run_job | 6 +-
src/bin/forge_run_plugin_job | 6 +-
src/bin/forge_set_password | 6 +-
src/bin/httpd_log_demux.php | 32 +-
src/bin/inject-files.php | 4 +-
src/bin/inject-groups.php | 15 +-
src/bin/inject-users.php | 4 +-
src/bin/list-projects-using-plugin.php | 1 -
src/bin/normalize_roles.php | 2 -
src/bin/populate_template_project.php | 12 +-
src/bin/ssh_akc.php | 4 +-
src/bin/sync_unix_groups.php | 2 -
src/common/include/RBAC.php | 41 +--
src/common/include/SCMPlugin.class.php | 5 +
src/common/include/User.class.php | 2 +-
src/common/include/cron_utils.php | 6 +
src/common/include/system/pgsql.class.php | 187 ++++++++---
src/common/widget/WidgetLayoutManager.class.php | 89 ++----
src/cronjobs/db/site_stats.php | 2 +-
src/cronjobs/shell/homedirs.php | 3 +-
src/db/20120603-docman-file-moved-in-fs.php | 16 +-
src/db/20150316-nss.sql | 22 ++
.../extsubproj-init.php => db/20150317-nss.php} | 24 +-
src/db/20150322-set-layouts_seq.sql | 3 +
src/db/20150402-scmro.sql | 13 +
.../extsubproj-init.php => db/20150403-scmro.php} | 23 +-
src/debian/control.in | 19 +-
src/debian/gen_control.sh | 2 +-
src/debian/rules | 4 +-
src/etc/config.ini.d/defaults.ini | 4 +
src/etc/cron.d/fusionforge-db | 8 +-
src/etc/cron.d/fusionforge-scm | 11 +
src/etc/httpd.conf.d/01-namevhost.conf | 6 -
src/etc/httpd.conf.d/02-config-main.conf | 26 --
src/etc/httpd.conf.d/04-config-vendor.conf | 10 -
src/etc/httpd.conf.d/20-vhosts-scm.conf | 5 +-
src/etc/httpd.conf.d/50-vhosts-scm.conf | 19 --
src/etc/httpd.conf.d/auth-main.inc | 9 +-
src/etc/httpd.conf.d/auth-projects.inc | 9 +-
src/etc/httpd.conf.d/ssl-on-scm.inc | 3 +-
src/etc/httpd.conf.d/ssl-on.inc | 30 +-
src/etc/httpd.conf.d/ssl-really-on.inc | 25 --
src/etc/httpd.conf.d/vhost-list.inc | 7 +-
src/etc/httpd.conf.d/vhost-main.inc | 36 ++-
...config-macros-scm.conf => vhost-scm-macros.inc} | 6 +-
src/etc/httpd.conf.d/vhost-scm.inc | 2 +-
.../mailman/cronjobs/manage_mailmanlists.php | 2 +-
.../mailman/etc/cron.d/fusionforge-plugin-mailman | 2 +-
src/plugins/scmbzr/common/BzrPlugin.class.php | 2 +-
src/plugins/scmgit/common/GitPlugin.class.php | 78 ++---
src/plugins/scmsvn/common/SVNPlugin.class.php | 10 +-
...ros-scmsvn.conf => vhost-scm-macros-scmsvn.inc} | 6 +-
.../{admssw/etc/admssw.ini => wiki/etc/wiki.ini} | 5 +-
src/post-install.d/common/user.sh | 5 +-
src/post-install.d/db/upgrade.php | 2 +-
src/post-install.d/shell/shell.sh | 9 +-
src/post-install.d/web/web.sh | 24 +-
src/rpm/fusionforge.spec.in | 15 +
src/templates/httpd.vhosts.tmpl | 3 +-
src/www/pm/postuploadcsv.php | 119 +++----
src/www/scm/viewvc.php | 2 +-
tests/func/50_PluginsScmBzr/bzrTest.php | 15 +-
tests/func/db_reload.sh | 7 +-
vm/Vagrantfile-sample | 6 +-
vm/packer/fusionforge-dev-debian.json | 14 +-
vm/packer/http/preseed.cfg | 326 +++++++++++++++-----
vm/packer/scripts/base-debian.sh | 2 +-
vm/packer/scripts/fusionforge-source.sh | 12 +-
vm/packer/scripts/vagrant.sh | 4 +-
77 files changed, 892 insertions(+), 596 deletions(-)
create mode 100644 src/db/20150316-nss.sql
copy src/{plugins/extsubproj/common/extsubproj-init.php =>
db/20150317-nss.php} (60%)
create mode 100644 src/db/20150322-set-layouts_seq.sql
create mode 100644 src/db/20150402-scmro.sql
copy src/{plugins/extsubproj/common/extsubproj-init.php =>
db/20150403-scmro.php} (67%)
create mode 100644 src/etc/cron.d/fusionforge-scm
delete mode 100644 src/etc/httpd.conf.d/01-namevhost.conf
delete mode 100644 src/etc/httpd.conf.d/02-config-main.conf
delete mode 100644 src/etc/httpd.conf.d/04-config-vendor.conf
delete mode 100644 src/etc/httpd.conf.d/50-vhosts-scm.conf
delete mode 100644 src/etc/httpd.conf.d/ssl-really-on.inc
rename src/etc/httpd.conf.d/{05-config-macros-scm.conf =>
vhost-scm-macros.inc} (71%)
rename src/plugins/scmsvn/etc/httpd.conf.d/{05-config-macros-scmsvn.conf =>
vhost-scm-macros-scmsvn.inc} (57%)
copy src/plugins/{admssw/etc/admssw.ini => wiki/etc/wiki.ini} (84%)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
