[Fusionforge-commits] FusionForge branch master updated. v5.3-rc4-459-ga480118

[Franck Villaume]

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  a4801188ecb10f4ab932e55a43c1a7311209a89a (commit)
       via  c2b97fe2b65acc5760ec6b112d795f2934e65fb2 (commit)
       via  71cab2e6a4d2d87e5bd74800757266d3c0575871 (commit)
       via  808ffbd3574b142014d5357fb62a508303d8bc6c (commit)
       via  259ce86dbf651a5175df1cab11c6bd3070e573f4 (commit)
       via  7e409324f4d70dfd3691a10d6302c4df0ac00a4f (commit)
       via  d6e2dd66a78e2e9e4f8105edcd25906c174a3f0b (commit)
       via  b022f26c806971ff477889cb4d30c85e4c9908b4 (commit)
      from  e560cb6ebfd112659fd55bded007f466f3da97a8 (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 a4801188ecb10f4ab932e55a43c1a7311209a89a
Merge: e560cb6 c2b97fe
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Mar 23 18:21:57 2014 +0100

    merge Branch_5_3

diff --cc src/www/survey/include/SurveyHTML.class.php
index 43a37b5,4506555..5113a1e
--- a/src/www/survey/include/SurveyHTML.class.php
+++ b/src/www/survey/include/SurveyHTML.class.php
@@@ -247,8 -248,8 +247,8 @@@ class SurveyHTML extends Error 
  		/* Deletable questions */
  		if (count($arr_to_del) > 0) {
  			$ret.='<h2>'. _('Questions in this Survey').'</h2>';
- 			$title_arr = array(_('Question'), _('Type'), _('Order'), _('Delete from this Survey'));
+ 			$title_arr = array('', _('Question'), _('Type'), _('Order'), _('Delete from this Survey'));
 -			$ret.=$GLOBALS['HTML']->listTableTop ($title_arr);
 +			$ret.= $HTML->listTableTop ($title_arr);
  		}
  
  		for($i = 0;  $i  <  count($arr_to_del);  $i++)  {

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

Summary of changes:
 src/cronjobs/create_scm_repos.php           |    2 +-
 src/cronjobs/create_vhosts.php              |    2 +-
 src/cronjobs/homedirs.php                   |    2 +-
 src/cronjobs/ssh_create.php                 |    6 +-
 src/packaging/control/000source             |    2 +-
 src/packaging/control/012meta-full          |    2 +-
 src/packaging/control/120lists-mailman      |    2 +-
 src/packaging/control/999transitional       |    4 +-
 src/packaging/install/common                |    7 +-
 src/packaging/install/shell-postgresql      |    4 +-
 src/packaging/install/web-apache2           |    2 +-
 src/packaging/install/web-apache2-vhosts    |    1 +
 src/packaging/links/web-apache2             |   14 ----
 src/utils/install-nsspgsql.sh               |   10 +--
 src/www/survey/admin/show_questions.php     |   93 ---------------------------
 src/www/survey/admin/survey.php             |    9 ++-
 src/www/survey/include/SurveyHTML.class.php |    2 +-
 17 files changed, 30 insertions(+), 134 deletions(-)
 delete mode 100644 src/www/survey/admin/show_questions.php


hooks/post-receive
-- 
FusionForge