[Fusionforge-commits] FusionForge branch feature/twig-template-engine updated. 531408ffb0a39aa3bb49af8048440d366034b719

[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, feature/twig-template-engine has been updated
       via  531408ffb0a39aa3bb49af8048440d366034b719 (commit)
       via  7ac4cd4e72ba4c7d3ec48900c144396e602425ac (commit)
       via  e337630ffa34ea1b8bee711dba03e7fcebe8a117 (commit)
       via  067c1b63eed7d121e906dad27ee15e99d7d13782 (commit)
       via  448f715422a13c08771b090b856b904be263b194 (commit)
       via  7f4d57e67066e347b3aa71d9cce017d3c1e017e9 (commit)
       via  f2d2d311a760182c5b3061f8aa76e56e517704db (commit)
       via  6f666e38d63201eea38af7baca9f5cf390d38c62 (commit)
       via  d4d188b8d69c9175e59596432ff83faa0d124e1a (commit)
       via  f84a3bf303535a538a77cd5f3249a62e6ac001c0 (commit)
       via  d3341506967826a18e20fbb30e1ad414560bcb87 (commit)
       via  6c27e897749524bea79af1b5e895492fd2057765 (commit)
       via  4dfbb3e4c172dde1c00081f660f500329c15c3ce (commit)
       via  6067aa978cacc2b40034af9e5eff56dd00faa7cf (commit)
       via  e911e87be30a39f751a82d6a62efe3267d9b2fda (commit)
       via  ea8f310b634a196fdc9521069571c973564abe1a (commit)
       via  83343da5e0ba6ef7f16d4f8e57ff35303bfce133 (commit)
       via  18304aae8efb2b29bd55ede227177124ad472dd2 (commit)
       via  f7447f60be4dfffe895cedd81f1be1659f48d3b1 (commit)
       via  c0ece8ff43df1a748b81b55596d35f092f1ee1ca (commit)
       via  9701e27a4e206d71a94d561932a7bb76a0066351 (commit)
      from  ace94bb49be4232da20e183b19dab9abc2b8d483 (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 531408ffb0a39aa3bb49af8048440d366034b719
Merge: ace94bb 7ac4cd4
Author: Roland Mas <lolando at debian.org>
Date:   Wed Apr 29 11:28:20 2015 +0200

    Merge branch 'master' into feature/twig-template-engine
    
    Conflicts:
    	autoinstall/install-src.sh

diff --cc autoinstall/install-src.sh
index ddfc72e,c28b2de..b2bdcf3
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@@ -43,8 -42,8 +43,8 @@@ if [ -e /etc/debian_version ]; the
  else
      yum install -y make tar
      backports_rpm
 -    yum --enablerepo=epel install -y httpd-itk
 +    yum --enablerepo=epel install -y httpd-itk php-twig
-     yum install -y gettext php-cli php-pgsql php-process php-mbstring \
+     yum install -y gettext php-cli php-pgsql php-process php-mbstring php-pear-HTTP \
  	httpd mod_dav_svn mod_ssl postgresql-server nscd \
  	subversion viewvc python-pycurl git gitweb xinetd \
  	mediawiki119 \

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

Summary of changes:
 autoinstall/install-src.sh                         |    4 +-
 autoinstall/uninstall.sh                           |    2 +-
 src/CHANGES                                        |   82 +-
 src/GNUmakefile                                    |    4 +
 src/VERSION                                        |    2 +-
 src/common/forum/ForumFactory.class.php            |    4 +-
 src/common/include/Group.class.php                 |  113 +-
 src/common/mail/MailingListFactory.class.php       |    4 +-
 src/common/pm/ProjectGroupFactory.class.php        |    4 +-
 src/common/survey/SurveyFactory.class.php          |    4 +-
 src/common/tracker/ArtifactTypeFactory.class.php   |    4 +-
 src/common/tracker/actions/detail.php              |    2 +-
 src/common/tracker/actions/mod-limited.php         |    2 +-
 src/common/tracker/actions/mod.php                 |    2 +-
 src/debian/changelog                               |   12 +-
 src/debian/control.in                              |    5 +-
 src/debian/rules                                   |    1 +
 src/etc/init.d/fusionforge-db-remote               |   18 +
 src/locale/fusionforge.pot                         |17778 +++++++++++---------
 .../scmhook/www/committracker/newcommit.php        |    2 +-
 .../scmhook/www/committracker/newcommitgit.php     |    2 +-
 src/rpm/fusionforge.spec.in                        |    7 +-
 src/rpm/gen_spec.sh                                |   18 +-
 src/rpm/plugins                                    |    4 +-
 src/www/index_std.php                              |  145 +-
 tests/func/10_Site/projectsTest.php                |   25 +-
 tests/func/70_SOAP/soapTest.php                    |    2 +-
 27 files changed, 9747 insertions(+), 8505 deletions(-)
 create mode 100755 src/etc/init.d/fusionforge-db-remote


hooks/post-receive
-- 
FusionForge