From cdfc277bb7bd3b8fad0e45d9317fdd4578282206 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 17 Mar 2010 17:48:29 -0400 Subject: [PATCH 1/6] bug #2972232 Import menu tab not present on main page --- ChangeLog | 1 + libraries/server_links.inc.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cfa265d56..2cc165005 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA shown in hex - bug #2967565 [insert] UNHEX not selected by default when inserting BINARY - [navi] Changed link to git repository on main page +- bug #2972232 [menu] Import menu tab not present on main page 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index 1366baa7b..40479d2c4 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -87,9 +87,9 @@ $tabs['import']['icon'] = 'b_import.png'; $tabs['import']['link'] = 'server_import.php'; $tabs['import']['text'] = $strImport; -$tabs['import']['icon'] = 's_sync.png'; -$tabs['import']['link'] = 'server_synchronize.php'; -$tabs['import']['text'] = $strSynchronize; +$tabs['synchronize']['icon'] = 's_sync.png'; +$tabs['synchronize']['link'] = 'server_synchronize.php'; +$tabs['synchronize']['text'] = $strSynchronize; echo PMA_generate_html_tabs($tabs, array()); unset($tabs); From e859e311496ae25e1c6de6412084bc336f0798b9 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 22 Mar 2010 13:23:55 -0400 Subject: [PATCH 2/6] there was an extra space in the ChangeLog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2cc165005..5140d2ef3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA shown in hex - bug #2967565 [insert] UNHEX not selected by default when inserting BINARY - [navi] Changed link to git repository on main page -- bug #2972232 [menu] Import menu tab not present on main page +- bug #2972232 [menu] Import menu tab not present on main page 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly From 0f6215f70ed47a1c26743dab636fb74042d98833 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 22 Mar 2010 13:24:48 -0400 Subject: [PATCH 3/6] testing before merge --- tbl_row_action.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tbl_row_action.php b/tbl_row_action.php index d72c7d537..efcc74d7b 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -43,7 +43,7 @@ if (isset($_REQUEST['submit_mult'])) { $submit_mult = 'row_export'; } -// garvin: If the 'Ask for confirmation' button was pressed, this can only come +// If the 'Ask for confirmation' button was pressed, this can only come // from 'delete' mode, so we set it straight away. if (isset($_REQUEST['mult_btn'])) { $submit_mult = 'row_delete'; From 16886bc3fb49d357fb583d7e28c51de99103280a Mon Sep 17 00:00:00 2001 From: bhdouglass Date: Mon, 22 Mar 2010 17:40:04 -0400 Subject: [PATCH 4/6] Patch #2974341 In db Structure, clicking on table name should Browse if possible --- ChangeLog | 2 ++ db_structure.php | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9ec21d78..69a860d86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + [lang] Uzbek update, thanks to Orzu Samarqandiy + rfe #2958013 [import] After import, also list uploaded filename, thanks to Pavel Konnikov and Herman van Rink ++ patch #2974341 [structure] Clicking on table name in db Structure should + Browse the table if possible, thanks to bhdouglass - dougboybhd 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/db_structure.php b/db_structure.php index 2111edd81..a4d99cbb7 100644 --- a/db_structure.php +++ b/db_structure.php @@ -300,9 +300,11 @@ foreach ($tables as $keyname => $each_table) { if ($each_table['TABLE_ROWS'] > 0) { $browse_table = '' . $titles['Browse'] . ''; $search_table = '' . $titles['Search'] . ''; + $browse_table_label = '' . $truename . ''; } else { $browse_table = $titles['NoBrowse']; $search_table = $titles['NoSearch']; + $browse_table_label = '' . $truename . ''; } if (! $db_is_information_schema) { @@ -382,8 +384,7 @@ foreach ($tables as $keyname => $each_table) { /> - + ' : ''. $do ? ' REPLICATED' : ''; ?> From 82905fa361f54701226cc580e3dc2561e4427ca4 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 22 Mar 2010 18:06:08 -0400 Subject: [PATCH 5/6] switched from svn to git --- Documentation.html | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Documentation.html b/Documentation.html index 6656c0e8c..eaf3a2e1e 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4326,20 +4326,23 @@ chmod o+rwx tmp

The following method is preferred for new developers:

-
  1. fetch the current SVN tree over anonymous SVN:
    - svn co https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin
    +
    1. fetch the current git repository over anonymous git:
      + git clone + git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
    2. add your stuff
    3. generate patch with your changes: - svn diff
      + git diff > xxx.diff
      4. -
    4. put the patch inside the submit your patch via the patch tracker of the phpMyAdmin project.
    -

    Write access to the SVN tree is granted only to experienced developers who +

    More details on git are available on our wiki.

    + +

    Write access to the repository is granted only to experienced developers who have already contributed something useful to phpMyAdmin.
    Also, have a look at the Developers section.

    From 6810e568f61cab1adbb23f34f6b4d07cbd971184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 22 Mar 2010 23:46:56 +0100 Subject: [PATCH 6/6] Proper HTML escaping. --- Documentation.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation.html b/Documentation.html index eaf3a2e1e..486af1018 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4332,7 +4332,7 @@ chmod o+rwx tmp
  2. add your stuff
  3. generate patch with your changes: - git diff > xxx.diff
    + git diff > xxx.diff
  4. submit your patch via the patch