[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8749-g1a82ae1

[Rouslan Placella]

The branch, master has been updated
       via  1a82ae1f11eb37012b041fcfe46fc06ecdbd779a (commit)
       via  3ec3c7ee1766331a25899483ff78ff468516fc2e (commit)
      from  7a31e75eb6b2e1d243e31eec953db22b46a0627c (commit)


- Log -----------------------------------------------------------------
commit 1a82ae1f11eb37012b041fcfe46fc06ecdbd779a
Merge: 7a31e75eb6b2e1d243e31eec953db22b46a0627c 3ec3c7ee1766331a25899483ff78ff468516fc2e
Author: Rouslan Placella <rouslan at placella.com>
Date:   Fri Jul 15 16:32:30 2011 +0100

    Merge branch 'QA_3_4'

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

Summary of changes:
 ChangeLog               |    1 +
 js/server_privileges.js |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b12d534..55ab190 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,7 @@ phpMyAdmin - ChangeLog
 - bug #3353811 [interface] Info message has "error" class
 - bug #3357837 [interface] TABbing through a NULL field in the inline mode resets NULL
 - remove version number in /setup
+- bug #3367993 [usability] Missing "Generate Password" button
 
 3.4.3.1 (2011-07-02)
 - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5
diff --git a/js/server_privileges.js b/js/server_privileges.js
index 10c3797..d5729d9 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -527,6 +527,7 @@ $(document).ready(function() {
         }
     });
 
+    displayPasswordGenerateButton();
 }, 'top.frame_content'); //end $(document).ready()
 
 /**#@- */


hooks/post-receive
-- 
phpMyAdmin