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  a2fb275cec74ec1eca4d890870dfb196a22019ff (commit)
       via  5d06aaef192c880392f4970b830f9d76837327d9 (commit)
       via  81a65b0ab8683b1b62597daa0ac1f102e9179296 (commit)
       via  9df89c090bdc7fe98b6f5e987ff3f35517b6e61e (commit)
       via  f2767965212472d38dfabd2a7551086abcdb3b79 (commit)
       via  f0916e4a89529b7dbcdf563a90ca7a3caa49be4b (commit)
       via  219a62163fc7bd4485bcb40b0a1461d6ea376516 (commit)
       via  04b09a26c57f35917b763ced216064377c31681a (commit)
       via  89ccee898a319650c8828b5af09a4197ce094a3e (commit)
       via  a3237f1a2b9fb61ace9e7ec087949561e852e481 (commit)
       via  63a0e797634548de3cfdefa20ba8afa104151130 (commit)
       via  5de342cfb503da07b93d0d21396b47fbb9c68742 (commit)
       via  cb8165397c84f3241a51416416aa5bdf3f7232d4 (commit)
      from  d5376a00f975a55c2850400b13f1120438d38f0c (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a2fb275cec74ec1eca4d890870dfb196a22019ff

commit a2fb275cec74ec1eca4d890870dfb196a22019ff
Merge: d5376a0 5d06aae
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date:   Sun Apr 8 10:08:59 2018 +0200

    Merge 6.1

diff --cc src/common/include/User.class.php
index 44b070a,4e1a434..846e59b
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@@ -1445,15 -1436,6 +1436,18 @@@ class FFUser extends FFError 
        }
  
        /**
++<<<<<<< HEAD
 +       * setMD5Passwd - Changes user's MD5 password.
 +       *
 +       * @param       string  $md5    The MD5-hashed password.
 +       */
 +      function setMD5Passwd($md5) {
 +              exit(_('Error')._(': ')._('Could not change password')._(': 
')._('MD5 obsoleted'));
 +      }
 +
 +      /**
++=======
++>>>>>>> 6.1
         * setUnixPasswd - Changes user's Unix-hashed password.
         *
         * @param       string  $unix   The Unix-hashed password.
@@@ -1468,7 -1450,7 +1462,11 @@@
                                array($unix, $this->getID()));
  
                        if (!$res || db_affected_rows($res) < 1) {
++<<<<<<< HEAD
 +                              $this->setError(_('Error')._(': ')._('Could not 
change password')._(': ').db_error());
++=======
+                               $this->setError(_('Error')._(': ')._('Cannot 
Change User Password')._(': ').db_error());
++>>>>>>> 6.1
                                db_rollback();
                                return false;
                        }

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

Summary of changes:
 autoinstall/common-backports                |   9 +-
 autoinstall/install-src.sh                  |   8 +-
 src/GNUmakefile.defaults                    |   2 +-
 src/common/docman/views/search.php          |   4 +-
 src/common/forum/AttachManager.class.php    |   2 +-
 src/common/forum/ForumAdmin.class.php       |   2 +-
 src/common/frs/views/shownotes.php          |   2 +-
 src/common/include/User.class.php           |  58 +-
 src/locale/es.po                            | 989 ++++++++++++++--------------
 src/plugins/scmhg/bin/install.sh            |   2 +-
 src/www/include/html.php                    |   2 +-
 src/www/survey/admin/show_csv.php           |  26 +-
 src/www/survey/admin/show_results.php       |  11 +-
 src/www/survey/include/SurveyHTML.class.php |   4 +-
 14 files changed, 536 insertions(+), 585 deletions(-)


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits

Reply via email to