- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11724-g5bc41ef
by Marc Delisle 22 Jul '11

22 Jul '11

The branch, master has been updated via 5bc41ef1dc31019daaa0933bec967ebff63b55e0 (commit) via 97055ad6fe4f13dccdf2288050e8c433a0db2be6 (commit) via 67ad16516b1f3a3e0039c15dfb35ab53f92391ed (commit) via 710362f869da38590ae507ee86c11c49c49387fa (commit) via 15a9db72b39bf033629c45a1cf87bd890ada9259 (commit) via 5288a55b9803c1b8fbb0fc580661ff5b2b46ac1e (commit) via 063b6bd544b35d7ee5a76e44c766258fb1c551de (commit) via 3a2d3e3c4eab717140526ca8ba5e6a234244c7d5 (commit) from 04d2a605dd2473be5c060faadb08916a3b4ca648 (commit) - Log ----------------------------------------------------------------- commit 5bc41ef1dc31019daaa0933bec967ebff63b55e0 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 22 14:34:46 2011 -0400 ChangeLog for "AJAX for table Structure column Add" commit 97055ad6fe4f13dccdf2288050e8c433a0db2be6 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 22 14:33:28 2011 -0400 Typo commit 67ad16516b1f3a3e0039c15dfb35ab53f92391ed Merge: 710362f869da38590ae507ee86c11c49c49387fa 04d2a605dd2473be5c060faadb08916a3b4ca648 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri Jul 22 23:32:28 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 710362f869da38590ae507ee86c11c49c49387fa Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri Jul 22 23:31:44 2011 +0530 Fixed issues in enum editor in table insert column option commit 15a9db72b39bf033629c45a1cf87bd890ada9259 Merge: 5288a55b9803c1b8fbb0fc580661ff5b2b46ac1e 49b2ca984a6c38fa7b49aeff3f1344d837cf5834 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri Jul 22 07:40:41 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 5288a55b9803c1b8fbb0fc580661ff5b2b46ac1e Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri Jul 22 07:40:14 2011 +0530 Fixed issues of Add Columns commit 063b6bd544b35d7ee5a76e44c766258fb1c551de Merge: 3a2d3e3c4eab717140526ca8ba5e6a234244c7d5 4925260d959d8bd7194b912ddd1317c71f7cc42b Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Thu Jul 21 23:55:31 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 3a2d3e3c4eab717140526ca8ba5e6a234244c7d5 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Thu Jul 21 23:53:37 2011 +0530 Ajaxified add columns option in table structure ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 12 +++++++- js/messages.php | 3 ++ js/tbl_structure.js | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++ tbl_addfield.php | 6 ++++ tbl_structure.php | 2 +- 6 files changed, 87 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38ac1e8..16e3cac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ phpMyAdmin - ChangeLog + [interface] Improved support for events + [interface] Improved support for triggers + [interface] Improved server monitoring ++ AJAX for table Structure column Add 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/js/functions.js b/js/functions.js index 1e2cced..7b36e51 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1836,12 +1836,12 @@ $(document).ready(function() { }, 'top.frame_content'); //end $(document).ready for 'Create Table' /** - * jQuery coding for 'Change Table'. Used on tbl_structure.php * + * jQuery coding for 'Change Table' and 'Add Column'. Used on tbl_structure.php * * Attach Ajax Event handlers for Change Table */ $(document).ready(function() { /** - *Ajax action for submitting the column change form + *Ajax action for submitting the "Column Change" and "Add Column" form **/ $("#append_fields_form input[name=do_save_data]").live('click', function(event) { event.preventDefault(); @@ -1876,16 +1876,20 @@ $(document).ready(function() { $("#result_query").prepend((data.message)); if ($("#change_column_dialog").length > 0) { $("#change_column_dialog").dialog("close").remove(); + } else if ($("#add_columns").length > 0) { + $("#add_columns").dialog("close").remove(); } /*Reload the field form*/ $.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize()+"&ajax_request=true", function(form_data) { $("#fieldsForm").remove(); + $("#addColumns").remove(); var $temp_div = $("<div id='temp_div'><div>").append(form_data); if ($("#sqlqueryresults").length != 0) { $temp_div.find("#fieldsForm").insertAfter("#sqlqueryresults"); } else { $temp_div.find("#fieldsForm").insertAfter(".error"); } + $temp_div.find("#addColumns").insertBefore("iframe.IE_hack"); /*Call the function to display the more options in table*/ displayMoreTableOpts(); }); @@ -2107,6 +2111,10 @@ $(document).ready(function() { $("#popup_background").css({"opacity":"0.7"}); $("#popup_background").fadeIn("fast"); $("#enum_editor").fadeIn("fast"); + /**Replacing the column name in the enum editor header*/ + var column_name = $("#append_fields_form").find("input[id=field_0_1]").attr("value"); + var h3_text = $("#enum_editor h3").html(); + $("#enum_editor h3").html(h3_text.split('"')[0]+'"'+column_name+'"'); // Get the values var values = $(this).parent().prev("input").attr("value").split(","); diff --git a/js/messages.php b/js/messages.php index 5b91d79..4cfa7e7 100644 --- a/js/messages.php +++ b/js/messages.php @@ -207,6 +207,9 @@ $js_messages['strShowSearchCriteria'] = __('Show search criteria'); /* For tbl_change.js */ $js_messages['strIgnore'] = __('Ignore'); +/* For tbl_structure.js */ +$js_messages['strAddColumns'] = __('Add columns'); + /* Designer (pmd/scripts/move.js) */ $js_messages['strSelectReferencedKey'] = __('Select referenced key'); $js_messages['strSelectForeignKey'] = __('Select Foreign Key'); diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 69f872d..897cad8 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -336,6 +336,70 @@ $(document).ready(function() { }); } //end show/hide table index + /** + *Ajax event handler for Add column(s) + **/ + $("#addColumns.ajax input[value=Go]").live('click', function(event){ + event.preventDefault(); + + /*Remove the hidden dialogs if there are*/ + if ($('#add_columns').length != 0) { + $('#add_columns').remove(); + } + var $div = $('<div id="add_columns"></div>'); + + var $form = $("#addColumns"); + + /** + * @var button_options Object that stores the options passed to jQueryUI + * dialog + */ + var button_options = {}; + // in the following function we need to use $(this) + button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();} + + var button_options_error = {}; + button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();} + var $msgbox = PMA_ajaxShowMessage(); + + $.get( $form.attr('action') , $form.serialize()+"&ajax_request=true" , function(data) { + //in the case of an error, show the error message returned. + if (data.success != undefined && data.success == false) { + $div + .append(data.error) + .dialog({ + title: PMA_messages['strAddColumns'], + height: 230, + width: 900, + open: PMA_verifyTypeOfAllColumns, + modal: true, + buttons : button_options_error + })// end dialog options + } else { + $div + .append(data) + .dialog({ + title: PMA_messages['strAddColumns'], + height: 600, + width: 900, + open: PMA_verifyTypeOfAllColumns, + modal: true, + buttons : button_options + }) + //Remove the top menu container from the dialog + .find("#topmenucontainer").hide() + ; // end dialog options + + $div = $("#add_columns"); + /*changed the z-index of the enum editor to allow the edit*/ + $("#enum_editor").css("z-index", "1100"); + PMA_convertFootnotesToTooltips($div); + } + PMA_ajaxRemoveMessage($msgbox); + }) // end $.get() + }); + + }) // end $(document).ready() @@ -396,6 +460,8 @@ function changeColumns(action,url) { $("#append_fields_form input[name=do_save_data]").addClass("ajax"); /*changed the z-index of the enum editor to allow the edit*/ $("#enum_editor").css("z-index", "1100"); + $div = $("#change_column_dialog"); + PMA_convertFootnotesToTooltips($div); } PMA_ajaxRemoveMessage($msgbox); }) // end $.get() diff --git a/tbl_addfield.php b/tbl_addfield.php index ec910fd..a866fef 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -184,6 +184,12 @@ if (isset($_REQUEST['do_save_data'])) { // Go back to the structure sub-page $message = PMA_Message::success(__('Table %1$s has been altered successfully')); $message->addParam($table); + + if( $GLOBALS['is_ajax_request'] == true) { + $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + PMA_ajaxResponse($message, $message->isSuccess(),$extra_data); + } + $active_page = 'tbl_structure.php'; require './tbl_structure.php'; } else { diff --git a/tbl_structure.php b/tbl_structure.php index afac23f..a4e9692 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -668,7 +668,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) { ?> <br /> -<form method="post" action="tbl_addfield.php" +<form method="post" action="tbl_addfield.php" id="addColumns" name="addColumns" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : '');?> onsubmit="return checkFormElementInRange(this, 'num_fields', '<?php echo str_replace('\'', '\\\'', __('You have to add at least one column.')); ?>', 1)"> <?php echo PMA_generate_common_hidden_inputs($db, $table); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11716-g04d2a60
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 04d2a605dd2473be5c060faadb08916a3b4ca648 (commit) via 06bfdd7ca6d76335f45d53134770979d7d25d739 (commit) from c968408de7b5353832c428cc85901080ed7394f8 (commit) - Log ----------------------------------------------------------------- commit 04d2a605dd2473be5c060faadb08916a3b4ca648 Merge: c968408de7b5353832c428cc85901080ed7394f8 06bfdd7ca6d76335f45d53134770979d7d25d739 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 15:53:58 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24167bd..38ac1e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,8 @@ phpMyAdmin - ChangeLog - bug #3363221 [display] Missing Server Parameter on inline sql query - bug #3367986 [navi] Drop field -> lost active table - remove misleading comment on the "Rename database" interface +- bug #3374374 [interface] Fix footnote for inexact count while browsing +- bug #3372807 [interface] Fix security warning link in setup - bug #3374347 [display] Backquotes in normal text on import page 3.4.3.1 (2011-07-02) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-41-g06bfdd7
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, QA_3_4 has been updated via 06bfdd7ca6d76335f45d53134770979d7d25d739 (commit) from 9a268729f0cb0aeb2d124b58ca22ef8e7bd7baf6 (commit) - Log ----------------------------------------------------------------- commit 06bfdd7ca6d76335f45d53134770979d7d25d739 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 15:52:01 2011 +0200 Add changelog entries ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76f3514..021c2cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ phpMyAdmin - ChangeLog - bug #3363221 [display] Missing Server Parameter on inline sql query - bug #3367986 [navi] Drop field -> lost active table - remove misleading comment on the "Rename database" interface +- bug #3374374 [interface] Fix footnote for inexact count while browsing +- bug #3372807 [interface] Fix security warning link in setup - bug #3374347 [display] Backquotes in normal text on import page 3.4.3.1 (2011-07-02) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11714-gc968408
by Marc Delisle 22 Jul '11

22 Jul '11

The branch, master has been updated via c968408de7b5353832c428cc85901080ed7394f8 (commit) via 9a268729f0cb0aeb2d124b58ca22ef8e7bd7baf6 (commit) via 201ad07ea8883fc8c3a18227a656ea56fe7b18fc (commit) from 3024f1e8672b63d8f88db70db4943acebfa16420 (commit) - Log ----------------------------------------------------------------- commit c968408de7b5353832c428cc85901080ed7394f8 Merge: 3024f1e8672b63d8f88db70db4943acebfa16420 9a268729f0cb0aeb2d124b58ca22ef8e7bd7baf6 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 22 09:35:51 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_import.lib.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc2f709..24167bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ phpMyAdmin - ChangeLog - bug #3363221 [display] Missing Server Parameter on inline sql query - bug #3367986 [navi] Drop field -> lost active table - remove misleading comment on the "Rename database" interface +- bug #3374347 [display] Backquotes in normal text on import page 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 052a023..d709631 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -63,7 +63,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { complete = response.complete; if (total==0 && complete==0 && percent==0) { - $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.')); ?>'); + $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'), false); ?>'); $('#upload_form_status').css("display", "none"); } else { $('#upload_form_status_info').html(' '+Math.round(percent)+'%, '+complete+'/'+total); @@ -73,7 +73,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { if (finished==true) { $('#importmain').css('display', 'none'); $('#import_form_status').css('display', 'inline'); - $('#import_form_status').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file is being processed, please be patient.')); ?> '); + $('#import_form_status').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file is being processed, please be patient.'), false); ?> '); $('#import_form_status').load('import_status.php?message=true&<?php echo PMA_generate_common_url(); ?>'); // loads the message, either success or mysql error <?php // reload the left sidebar when the import is finished @@ -95,7 +95,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { <?php } else { // no plugin available ?> - $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.')) . PMA_showDocu('faq2_9'); ?>'); + $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.'), false) . PMA_showDocu('faq2_9'); ?>'); $('#upload_form_status').css("display", "none"); <?php } // else hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-40-g9a26872
by Marc Delisle 22 Jul '11

22 Jul '11

The branch, QA_3_4 has been updated via 9a268729f0cb0aeb2d124b58ca22ef8e7bd7baf6 (commit) via 201ad07ea8883fc8c3a18227a656ea56fe7b18fc (commit) from 5f9c187010dcf2b51bf3dee516789b6fae9f2363 (commit) - Log ----------------------------------------------------------------- commit 9a268729f0cb0aeb2d124b58ca22ef8e7bd7baf6 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 22 09:34:42 2011 -0400 ChangeLog entry for bug #3374347 commit 201ad07ea8883fc8c3a18227a656ea56fe7b18fc Author: Sven Strickroth <email(a)cs-ware.de> Date: Fri Jul 22 00:52:06 2011 +0200 Do not add backquotes for normal displayed text Signed-off-by: Sven Strickroth <email(a)cs-ware.de> ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_import.lib.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 250bd1a..76f3514 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog - bug #3363221 [display] Missing Server Parameter on inline sql query - bug #3367986 [navi] Drop field -> lost active table - remove misleading comment on the "Rename database" interface +- bug #3374347 [display] Backquotes in normal text on import page 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 3a9c2ea..c56c461 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -63,7 +63,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { complete = response.complete; if (total==0 && complete==0 && percent==0) { - $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.')); ?>'); + $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'), false); ?>'); $('#upload_form_status').css("display", "none"); } else { $('#upload_form_status_info').html(' '+Math.round(percent)+'%, '+complete+'/'+total); @@ -73,7 +73,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { if (finished==true) { $('#importmain').css('display', 'none'); $('#import_form_status').css('display', 'inline'); - $('#import_form_status').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file is being processed, please be patient.')); ?> '); + $('#import_form_status').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file is being processed, please be patient.'), false); ?> '); $('#import_form_status').load('import_status.php?message=true&<?php echo PMA_generate_common_url(); ?>'); // loads the message, either success or mysql error <?php // reload the left sidebar when the import is finished @@ -95,7 +95,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { <?php } else { // no plugin available ?> - $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.')) . PMA_showDocu('faq2_9'); ?>'); + $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.'), false) . PMA_showDocu('faq2_9'); ?>'); $('#upload_form_status').css("display", "none"); <?php } // else hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11711-g3024f1e
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 3024f1e8672b63d8f88db70db4943acebfa16420 (commit) from 11937b06bd1bffc24cacd0f45d2ce749387c4574 (commit) - Log ----------------------------------------------------------------- commit 3024f1e8672b63d8f88db70db4943acebfa16420 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 15:21:57 2011 +0200 Fix syntax errors in translation ----------------------------------------------------------------------- Summary of changes: po/pt_BR.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index a3d4cb1..b2479ad 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10269,7 +10269,7 @@ msgid "" "You are not using a secure connection; all data (including potentially " "sensitive information, like passwords) is transferred unencrypted!" msgstr "Você não está usando conexão segura; todos dados (incluindo " -possíveis informações sensíveis, como senhas) são transferidos sem criptografia." +"possíveis informações sensíveis, como senhas) são transferidos sem criptografia." #: setup/frames/index.inc.php:60 #, php-format @@ -10277,7 +10277,7 @@ msgid "" "If your server is also configured to accept HTTPS requests follow [a@%s]this " "link[/a] to use a secure connection." msgstr "Se o seu servidor também está configurado para aceitar requisições HTTPS " -siga [a@%s]este link[/a] para usar uma conexão segura." +"siga [a@%s]este link[/a] para usar uma conexão segura." #: setup/frames/index.inc.php:64 msgid "Insecure connection" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11710-g11937b0
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 11937b06bd1bffc24cacd0f45d2ce749387c4574 (commit) via 5f9c187010dcf2b51bf3dee516789b6fae9f2363 (commit) from 4a80c3e62d070d18ce12cc9bcf29d753e3eecef1 (commit) - Log ----------------------------------------------------------------- commit 11937b06bd1bffc24cacd0f45d2ce749387c4574 Merge: 4a80c3e62d070d18ce12cc9bcf29d753e3eecef1 5f9c187010dcf2b51bf3dee516789b6fae9f2363 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 15:19:59 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: setup/lib/index.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index 04fdfd1..9823cbd 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -264,7 +264,7 @@ function perform_config_checks() $strLoginCookieValidityWarning3 = __('If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin cookie validity%s must be set to a value less or equal to it.'); $strLoginCookieValidityWarning3 = sprintf($strLoginCookieValidityWarning3, '[a@?page=form&formset=Features#tab_Security]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]'); $strSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - %shost authentication%s settings and %strusted proxies list%s. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'); - $strSecurityInfoMsg = sprintf($strSecurityInfoMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server_config]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '%s'); + $strSecurityInfoMsg = sprintf($strSecurityInfoMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server_config]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]'); $strServerAuthConfigMsg = __('You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set %sauthentication type%s to [kbd]cookie[/kbd] or [kbd]http[/kbd].'); $strServerAuthConfigMsg = sprintf($strServerAuthConfigMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server]', '[/a]'); $strZipDumpExportWarning = __('%sZip compression%s requires functions (%s) which are unavailable on this system.'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-38-g5f9c187
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, QA_3_4 has been updated via 5f9c187010dcf2b51bf3dee516789b6fae9f2363 (commit) from 54398f8a124702e30820bc4636040dda1db6b71b (commit) - Log ----------------------------------------------------------------- commit 5f9c187010dcf2b51bf3dee516789b6fae9f2363 Author: Jørgen Thomsen <joergent(a)users.sourceforge.neT> Date: Fri Jul 22 15:19:31 2011 +0200 Fix format parameters ----------------------------------------------------------------------- Summary of changes: setup/lib/index.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index aa0d044..149918c 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -264,7 +264,7 @@ function perform_config_checks() $strLoginCookieValidityWarning3 = __('If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin cookie validity%s must be set to a value less or equal to it.'); $strLoginCookieValidityWarning3 = sprintf($strLoginCookieValidityWarning3, '[a@?page=form&formset=Features#tab_Security]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]'); $strSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - %shost authentication%s settings and %strusted proxies list%s. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'); - $strSecurityInfoMsg = sprintf($strSecurityInfoMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server_config]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '%s'); + $strSecurityInfoMsg = sprintf($strSecurityInfoMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server_config]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]'); $strServerAuthConfigMsg = __('You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set %sauthentication type%s to [kbd]cookie[/kbd] or [kbd]http[/kbd].'); $strServerAuthConfigMsg = sprintf($strServerAuthConfigMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server]', '[/a]'); $strZipDumpExportWarning = __('%sZip compression%s requires functions (%s) which are unavailable on this system.'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11708-g4a80c3e
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 4a80c3e62d070d18ce12cc9bcf29d753e3eecef1 (commit) via 54398f8a124702e30820bc4636040dda1db6b71b (commit) from c8967b62309eb6df7042fd44848042cd7f9d8d40 (commit) - Log ----------------------------------------------------------------- commit 4a80c3e62d070d18ce12cc9bcf29d753e3eecef1 Merge: c8967b62309eb6df7042fd44848042cd7f9d8d40 54398f8a124702e30820bc4636040dda1db6b71b Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 15:17:25 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 9e02c24..af5dc89 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -2078,7 +2078,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) || $analyzed_sql[0]['where_clause'] == '1 ')) { // "j u s t b r o w s i n g" $pre_count = '~'; - $after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')), true); + $after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]'))); } else { $pre_count = ''; $after_count = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-37-g54398f8
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, QA_3_4 has been updated via 54398f8a124702e30820bc4636040dda1db6b71b (commit) from bea5556023b4561c23e82f5005059c5fb7b1cde8 (commit) - Log ----------------------------------------------------------------- commit 54398f8a124702e30820bc4636040dda1db6b71b Author: Sven Strickroth <email(a)cs-ware.de> Date: Fri Jul 22 02:01:17 2011 +0200 Do not call PMA_showHint with bbcode=true in display_tbl.lib.php This fixes an issue with an InnoDB-table on sql.php with "select * from tbl" showing that "total ~ N <sup>1</sup>" rows are displayed and with a JavaScript enabled browser the footnote gets hidden and it's impossible to find out what the <sup>1</sup> means. Signed-off-by: Sven Strickroth <email(a)cs-ware.de> ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index c7d74ef..c871612 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1937,7 +1937,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) || $analyzed_sql[0]['where_clause'] == '1 ')) { // "j u s t b r o w s i n g" $pre_count = '~'; - $after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')), true); + $after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]'))); } else { $pre_count = ''; $after_count = ''; hooks/post-receive -- phpMyAdmin

1 0