Git

git@phpmyadmin.net

18 participants
38268 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0-33-gee22340
by Marc Delisle 16 May '11

16 May '11

The branch, QA_3_4 has been updated via ee22340d83991ca3a3128db6d98310cc8b421a78 (commit) from 6923ccab3eb4f939cb584441a44f5537a6c4dd00 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 ++- js/navigation.js | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ac4491..d28578e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,8 +3,9 @@ 3.4.1.0 (not yet released) - bug #3301108 [interface] Synchronize and already configured host -- Bug #3302457 Inline edit and $cfg['PropertiesIconic'] +- bug #3302457 Inline edit and $cfg['PropertiesIconic'] - Patch #3302313 Show a translated label +- bug #3300981 [navi] Table filter is case sensitive 3.4.0.0 (2011-05-11) + rfe #2890226 [view] Enable VIEW rename diff --git a/js/navigation.js b/js/navigation.js index ed6dcb1..5052848 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -145,9 +145,11 @@ function PMA_setCookie(name, value, expires, path, domain, secure) { * */ function fast_filter(value){ + lowercase_value = value.toLowerCase(); $("#subel0 a[class!='tableicon']").each(function(idx,elem){ $elem = $(elem); - if (value && $elem.html().indexOf(value) == -1) { + // .indexOf is case sensitive so convert to lowercase to compare + if (value && $elem.html().toLowerCase().indexOf(lowercase_value) == -1) { $elem.parent().hide(); } else { $elem.parent().show(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-176-ge53fa42
by Marc Delisle 15 May '11

15 May '11

The branch, master has been updated via e53fa429808bca3ac3631519a18b7c26761194a5 (commit) from 8d3f3201fa5a6bf6f11bac28ec7af2c3627cfcbd (commit) - Log ----------------------------------------------------------------- commit e53fa429808bca3ac3631519a18b7c26761194a5 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 15 13:40:11 2011 -0400 Patch #3302354 Add gettext wrappers around a message ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/import.js | 2 +- js/messages.php | 3 +++ 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c9db95..f137943 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ + "up to date" message on main page when current version is up to date + Update to jQuery 1.6.1 + Patch #3256122 [search] Show/hide db search results ++ Patch #3302354 Add gettext wrappers around a message 3.4.1.0 (not yet released) - bug #3301108 [interface] Synchronize and already configured host diff --git a/js/import.js b/js/import.js index 0bcc3d0..8445716 100644 --- a/js/import.js +++ b/js/import.js @@ -16,7 +16,7 @@ function changePluginOpts() { var selected_plugin_name = $("#plugins option:selected").attr("value"); $("#" + selected_plugin_name + "_options").fadeIn('slow'); if(selected_plugin_name == "csv") { - $("#import_notification").text("Note: If the file contains multiple tables, they will be combined into one"); + $("#import_notification").text(PMA_messages['strImportCSV']); } else { $("#import_notification").text(""); } diff --git a/js/messages.php b/js/messages.php index 6d7b0e7..ee2b56c 100644 --- a/js/messages.php +++ b/js/messages.php @@ -86,6 +86,9 @@ $js_messages['strShowSearchResults'] = __('Show search results'); //$js_messages['strBrowsing'] = __('Browsing'); //$js_messages['strDeleting'] = __('Deleting'); +/* For import.js */ +$js_messages['strImportCSV'] = __('Note: If the file contains multiple tables, they will be combined into one'); + /* For sql.js */ $js_messages['strHideQueryBox'] = __('Hide query box'); $js_messages['strShowQueryBox'] = __('Show query box'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-175-g8d3f320
by Marc Delisle 15 May '11

15 May '11

The branch, master has been updated via 8d3f3201fa5a6bf6f11bac28ec7af2c3627cfcbd (commit) via 6923ccab3eb4f939cb584441a44f5537a6c4dd00 (commit) from 4d3d5eb46d43074b6690b7d6b51596f108288edd (commit) - Log ----------------------------------------------------------------- commit 8d3f3201fa5a6bf6f11bac28ec7af2c3627cfcbd Merge: 4d3d5eb46d43074b6690b7d6b51596f108288edd 6923ccab3eb4f939cb584441a44f5537a6c4dd00 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun May 15 13:24:42 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/import/csv.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 158e330..9c9db95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ 3.4.1.0 (not yet released) - bug #3301108 [interface] Synchronize and already configured host - Bug #3302457 Inline edit and $cfg['PropertiesIconic'] +- Patch #3302313 Show a translated label 3.4.0.0 (2011-05-11) + rfe #2890226 [view] Enable VIEW rename diff --git a/libraries/import/csv.php b/libraries/import/csv.php index e41ea35..aaff1b1 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -38,7 +38,7 @@ if (isset($plugin_list)) { } else { $hint = new PMA_Message(__('If the data in each row of the file is not in the same order as in the database, list the corresponding column names here. Column names must be separated by commas and not enclosed in quotations.')); $plugin_list['csv']['options'][] = - array('type' => 'text', 'name' => 'columns', 'text' => __('Column names: ' . PMA_showHint($hint))); + array('type' => 'text', 'name' => 'columns', 'text' => __('Column names: ') . PMA_showHint($hint)); } $plugin_list['csv']['options'][] = array('type' => 'end_group'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0-32-g6923cca
by Marc Delisle 15 May '11

15 May '11

The branch, QA_3_4 has been updated via 6923ccab3eb4f939cb584441a44f5537a6c4dd00 (commit) from e5826013d7eb0138f3ca7f79c699ee6b00c0c997 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/import/csv.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3ad38c..8ac4491 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ 3.4.1.0 (not yet released) - bug #3301108 [interface] Synchronize and already configured host - Bug #3302457 Inline edit and $cfg['PropertiesIconic'] +- Patch #3302313 Show a translated label 3.4.0.0 (2011-05-11) + rfe #2890226 [view] Enable VIEW rename diff --git a/libraries/import/csv.php b/libraries/import/csv.php index e41ea35..aaff1b1 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -38,7 +38,7 @@ if (isset($plugin_list)) { } else { $hint = new PMA_Message(__('If the data in each row of the file is not in the same order as in the database, list the corresponding column names here. Column names must be separated by commas and not enclosed in quotations.')); $plugin_list['csv']['options'][] = - array('type' => 'text', 'name' => 'columns', 'text' => __('Column names: ' . PMA_showHint($hint))); + array('type' => 'text', 'name' => 'columns', 'text' => __('Column names: ') . PMA_showHint($hint)); } $plugin_list['csv']['options'][] = array('type' => 'end_group'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-173-g4d3d5eb
by Marc Delisle 15 May '11

15 May '11

The branch, master has been updated via 4d3d5eb46d43074b6690b7d6b51596f108288edd (commit) from 38390524fe7fe487772c7ef5ab45731aa22a43be (commit) - Log ----------------------------------------------------------------- commit 4d3d5eb46d43074b6690b7d6b51596f108288edd Author: Thilanka <lgtkaushalya(a)gmail.com> Date: Sun May 15 13:07:32 2011 -0400 Patch #3256122 [search] Show/hide db search results ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/db_search.js | 43 +++++++++++++++++++++++++++++++++++++++---- js/messages.php | 2 ++ 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53390ba..158e330 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ + rfe #2021981 [interface] Add support for mass prefix change. + "up to date" message on main page when current version is up to date + Update to jQuery 1.6.1 ++ Patch #3256122 [search] Show/hide db search results 3.4.1.0 (not yet released) - bug #3301108 [interface] Synchronize and already configured host diff --git a/js/db_search.js b/js/db_search.js index 79c444e..33d5e17 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -51,14 +51,14 @@ function deleteResult(result_path , msg , ajaxEnable){ /** Load the deleted option to the page*/ $('#browse-results').load(result_path + " '"+'#result_query' + "'"); $('#sqlqueryform').load(result_path + " '"+'#sqlqueryform' + "'"); - $('#togglequerybox').html(PMA_messages['strHideQueryBox']); + $('#togglequerybox').html(PMA_messages['strShowQueryBox']); /** Refresh the search results after the deletion */ document.getElementById('buttonGo'). click(); //PMA_ajaxShowMessage(PMA_messages['strDeleting']); /** Show the results of the deletion option */ $('#browse-results').show(); - $('#sqlqueryform').show(); + $('#sqlqueryform').hide(); $('#togglequerybox').show(); } else @@ -90,6 +90,31 @@ $(document).ready(function() { $('#togglequerybox').hide(); }); /** + *Prepare a div containing a link for toggle the search results + */ + $('<div id="togglesearchresultsdiv"><a id="togglesearchresultlink"></a></div>') + .insertAfter('#searchresults') + /** don't show it until we have results on-screen */ + .hide(); + + $('<br class="clearfloat" />').insertAfter("#togglesearchresultsdiv").show(); + /** Changing the displayed text according to the hide/show criteria in search result forms*/ + + $('#togglesearchresultlink') + .html(PMA_messages['strHideSearchResults']) + .bind('click', function() { + var $link = $(this); + $('#searchresults').slideToggle(); + if ($link.text() == PMA_messages['strHideSearchResults']) { + $link.text(PMA_messages['strShowSearchResults']); + } else { + $link.text(PMA_messages['strHideSearchResults']); + } + /** avoid default click action */ + return false; + }); + + /** * Prepare a div containing a link for toggle the search form, otherwise it's incorrectly displayed * after a couple of clicks */ @@ -101,7 +126,7 @@ $(document).ready(function() { /** Changing the displayed text according to the hide/show criteria in search form*/ $("#togglequerybox").hide(); $("#togglequerybox").bind('click', function() { - var $link = $(this) + var $link = $(this); $('#sqlqueryform').slideToggle("medium"); if ($link.text() == PMA_messages['strHideQueryBox']) { $link.text(PMA_messages['strShowQueryBox']); @@ -110,7 +135,7 @@ $(document).ready(function() { } /** avoid default click action */ return false; - }) + }); /** don't show it until we have results on-screen */ @@ -149,6 +174,16 @@ $(document).ready(function() { // found results $("#searchresults").html(response); $("#sqlqueryresults").trigger('appendAnchor'); + + $('#togglesearchresultlink') + // always start with the Show message + .text(PMA_messages['strHideSearchResults']) + $('#togglesearchresultsdiv') + // now it's time to show the div containing the link + .show(); + $('#searchresults').show(); + + $('#db_search_form') // workaround for Chrome problem (bug #3168569) .slideToggle() diff --git a/js/messages.php b/js/messages.php index e0102b4..6d7b0e7 100644 --- a/js/messages.php +++ b/js/messages.php @@ -81,6 +81,8 @@ $js_messages['strNo'] = __('No'); /* For db_search.js */ $js_messages['strSearching'] = __('Searching'); +$js_messages['strHideSearchResults'] = __('Hide search results'); +$js_messages['strShowSearchResults'] = __('Show search results'); //$js_messages['strBrowsing'] = __('Browsing'); //$js_messages['strDeleting'] = __('Deleting'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-172-g3839052
by Marc Delisle 15 May '11

15 May '11

The branch, master has been updated via 38390524fe7fe487772c7ef5ab45731aa22a43be (commit) via e5826013d7eb0138f3ca7f79c699ee6b00c0c997 (commit) from 9ac8148754707d9c1533d21fada8ad183dd79f42 (commit) - Log ----------------------------------------------------------------- commit 38390524fe7fe487772c7ef5ab45731aa22a43be Merge: 9ac8148754707d9c1533d21fada8ad183dd79f42 e5826013d7eb0138f3ca7f79c699ee6b00c0c997 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun May 15 12:46:45 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index 44adb0d..9636f64 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -16,6 +16,7 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'server_privileges.js'; $GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; +$_add_user_error = false; require './libraries/server_common.inc.php'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0-31-ge582601
by Marc Delisle 15 May '11

15 May '11

The branch, QA_3_4 has been updated via e5826013d7eb0138f3ca7f79c699ee6b00c0c997 (commit) from dd3bd9043dcc104d112bba1a1b5e9d2e33d1c6f1 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index 19effc7..8263dab 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -16,6 +16,7 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'server_privileges.js'; $GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; +$_add_user_error = false; require './libraries/server_common.inc.php'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-170-g9ac8148
by Marc Delisle 15 May '11

15 May '11

The branch, master has been updated via 9ac8148754707d9c1533d21fada8ad183dd79f42 (commit) via dd3bd9043dcc104d112bba1a1b5e9d2e33d1c6f1 (commit) from 53e11786b4284130308e46b0bf792a95375bbd87 (commit) - Log ----------------------------------------------------------------- commit 9ac8148754707d9c1533d21fada8ad183dd79f42 Merge: 53e11786b4284130308e46b0bf792a95375bbd87 dd3bd9043dcc104d112bba1a1b5e9d2e33d1c6f1 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun May 15 12:37:52 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20c2694..53390ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ 3.4.1.0 (not yet released) - bug #3301108 [interface] Synchronize and already configured host +- Bug #3302457 Inline edit and $cfg['PropertiesIconic'] 3.4.0.0 (2011-05-11) + rfe #2890226 [view] Enable VIEW rename hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0-30-gdd3bd90
by Marc Delisle 15 May '11

15 May '11

The branch, QA_3_4 has been updated via dd3bd9043dcc104d112bba1a1b5e9d2e33d1c6f1 (commit) from 8bad4aea1e1046661a13e8f05acd4a2fab6fd32a (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e3a3871..b3ad38c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ 3.4.1.0 (not yet released) - bug #3301108 [interface] Synchronize and already configured host +- Bug #3302457 Inline edit and $cfg['PropertiesIconic'] 3.4.0.0 (2011-05-11) + rfe #2890226 [view] Enable VIEW rename hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-168-g53e1178
by Madhura Jayaratne 15 May '11

15 May '11

The branch, master has been updated via 53e11786b4284130308e46b0bf792a95375bbd87 (commit) via 8bad4aea1e1046661a13e8f05acd4a2fab6fd32a (commit) from 5f4a8e6a971e88135380a79ae09dc7ebd28010fb (commit) - Log ----------------------------------------------------------------- commit 53e11786b4284130308e46b0bf792a95375bbd87 Merge: 5f4a8e6a971e88135380a79ae09dc7ebd28010fb 8bad4aea1e1046661a13e8f05acd4a2fab6fd32a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun May 15 21:22:10 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: js/sql.js | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/js/sql.js b/js/sql.js index bd068cf..1872e12 100644 --- a/js/sql.js +++ b/js/sql.js @@ -118,10 +118,16 @@ function appendInlineAnchor() { .first() .prepend($img_object); } else { + // Only text is displayed. See $cfg['PropertiesIconic'] + $cloned_anchor.find('a').attr('href', '#'); + $cloned_anchor.find('a span').text(PMA_messages['strInlineEdit']); + // the link was too big so <input type="image"> is there $img_object = $cloned_anchor.find('input:image').attr('title', PMA_messages['strInlineEdit']); - var img_src = $img_object.attr('src').replace(/b_edit/,'b_inline_edit'); - $img_object.attr('src', img_src); + if ($img_object.length > 0) { + var img_src = $img_object.attr('src').replace(/b_edit/,'b_inline_edit'); + $img_object.attr('src', img_src); + } $cloned_anchor .find('.clickprevimage') .text(' ' + PMA_messages['strInlineEdit']); hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git