- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1563-gec60ed1
by Michal Čihař 01 Feb '11

01 Feb '11

The branch, master has been updated via ec60ed129ab5e07315e2c42a4f715cdca2798f33 (commit) from d8bb324c6b1a624c3868acd072dc0b854a6e64a4 (commit) - Log ----------------------------------------------------------------- commit ec60ed129ab5e07315e2c42a4f715cdca2798f33 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Feb 1 16:30:07 2011 +0100 This image is not used at all ----------------------------------------------------------------------- Summary of changes: themes/darkblue_orange/img/s_info.png | Bin 247 -> 0 bytes themes/original/img/s_info.png | Bin 247 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 themes/darkblue_orange/img/s_info.png delete mode 100644 themes/original/img/s_info.png diff --git a/themes/darkblue_orange/img/s_info.png b/themes/darkblue_orange/img/s_info.png deleted file mode 100644 index 0d3cbb6..0000000 Binary files a/themes/darkblue_orange/img/s_info.png and /dev/null differ diff --git a/themes/original/img/s_info.png b/themes/original/img/s_info.png deleted file mode 100644 index 0d3cbb6..0000000 Binary files a/themes/original/img/s_info.png and /dev/null differ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1562-gd8bb324
by Marc Delisle 01 Feb '11

01 Feb '11

The branch, master has been updated via d8bb324c6b1a624c3868acd072dc0b854a6e64a4 (commit) from 15fd805b8077a07e2b1c0af5b4401697e556bb8e (commit) - Log ----------------------------------------------------------------- commit d8bb324c6b1a624c3868acd072dc0b854a6e64a4 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Feb 1 07:49:25 2011 -0500 Unneeded wrapping of jQuery object ----------------------------------------------------------------------- Summary of changes: js/functions.js | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/js/functions.js b/js/functions.js index f4a939b..74a4fb8 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1837,16 +1837,17 @@ $(document).ready(function() { $(".drop_trigger_anchor").live('click', function(event) { event.preventDefault(); + $anchor = $(this); /** * @var curr_row Object reference to the current trigger's <tr> */ - var curr_row = $(this).parents('tr'); + var $curr_row = $anchor.parents('tr'); /** * @var question String containing the question to be asked for confirmation */ - var question = 'DROP TRIGGER IF EXISTS `' + $(curr_row).children('td:first').text() + '`'; + var question = 'DROP TRIGGER IF EXISTS `' + $curr_row.children('td:first').text() + '`'; - $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + $anchor.PMA_confirm(question, $anchor.attr('href'), function(url) { PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) { @@ -1857,7 +1858,7 @@ $(document).ready(function() { .remove() .end() .after(data.sql_query); - $(curr_row).hide("medium").remove(); + $curr_row.hide("medium").remove(); } else { PMA_ajaxShowMessage(data.error); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1561-g15fd805
by Marc Delisle 01 Feb '11

01 Feb '11

The branch, master has been updated via 15fd805b8077a07e2b1c0af5b4401697e556bb8e (commit) from 414a09a2e030439db713b78c9032bd2d2f0d7924 (commit) - Log ----------------------------------------------------------------- commit 15fd805b8077a07e2b1c0af5b4401697e556bb8e Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Feb 1 07:42:36 2011 -0500 Conditional Ajax for DROP TRIGGER ----------------------------------------------------------------------- Summary of changes: js/functions.js | 1 + libraries/tbl_triggers.lib.php | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/js/functions.js b/js/functions.js index 5b3273c..f4a939b 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1830,6 +1830,7 @@ $(document).ready(function() { /** * Attach Ajax event handlers for Drop Trigger. Used on tbl_structure.php + * @see $cfg['AjaxEnable'] */ $(document).ready(function() { diff --git a/libraries/tbl_triggers.lib.php b/libraries/tbl_triggers.lib.php index 43ba18e..15f07b2 100644 --- a/libraries/tbl_triggers.lib.php +++ b/libraries/tbl_triggers.lib.php @@ -28,6 +28,12 @@ if ($triggers) { __('Event')); $ct=0; $delimiter = '//'; + if ($GLOBALS['cfg']['AjaxEnable']) { + $conditional_class = 'class="drop_trigger_anchor"'; + } else { + $conditional_class = ''; + } + foreach ($triggers as $trigger) { $drop_and_create = $trigger['drop'] . $delimiter . "\n" . $trigger['create'] . "\n"; @@ -41,7 +47,7 @@ if ($triggers) { ($ct%2 == 0) ? 'even' : 'odd', $trigger['name'], PMA_linkOrButton('tbl_sql.php?' . $url_query . '&sql_query=' . urlencode($drop_and_create) . '&show_query=1&delimiter=' . urlencode($delimiter), $titles['Change']), - '<a class="drop_trigger_anchor" href="sql.php?' . $url_query . '&sql_query=' . urlencode($trigger['drop']) . '" >' . $titles['Drop'] . '</a>', + '<a ' . $conditional_class . ' href="sql.php?' . $url_query . '&sql_query=' . urlencode($trigger['drop']) . '" >' . $titles['Drop'] . '</a>', $trigger['action_timing'], $trigger['event_manipulation']); $ct++; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1560-g414a09a
by Marc Delisle 01 Feb '11

01 Feb '11

The branch, master has been updated via 414a09a2e030439db713b78c9032bd2d2f0d7924 (commit) from 879864b300ae3118e0e9bb5142c0f3da77807346 (commit) - Log ----------------------------------------------------------------- commit 414a09a2e030439db713b78c9032bd2d2f0d7924 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Feb 1 07:32:54 2011 -0500 Code refers to older functionality ----------------------------------------------------------------------- Summary of changes: js/functions.js | 77 ------------------------------------------------------- 1 files changed, 0 insertions(+), 77 deletions(-) diff --git a/js/functions.js b/js/functions.js index 42325ca..5b3273c 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1829,83 +1829,6 @@ $(document).ready(function() { }, 'top.frame_content'); //end $(document).ready for 'Create Table' /** - * Attach event handlers for Empty Table and Drop Table. Used wherever libraries/ - * tbl_links.inc.php is used. - */ -$(document).ready(function() { - - /** - * Attach Ajax event handlers for Empty Table - * - * @uses PMA_ajaxShowMessage() - * @uses $.PMA_confirm() - */ - $("#empty_table_anchor").live('click', function(event) { - event.preventDefault(); - - /** - * @var question String containing the question to be asked for confirmation - */ - var question = 'TRUNCATE TABLE ' + window.parent.table; - - $(this).PMA_confirm(question, $(this).attr('href'), function(url) { - - PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); - $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) { - if(data.success == true) { - PMA_ajaxShowMessage(data.message); - $("#topmenucontainer") - .next('div') - .remove() - .end() - .after(data.sql_query); - } - else { - PMA_ajaxShowMessage(data.error); - } - }) // end $.get - }) // end $.PMA_confirm() - }) // end Empty Table - - /** - * Attach Ajax event handler for Drop Table - * - * @uses PMA_ajaxShowMessage() - * @uses $.PMA_confirm() - * @uses window.parent.refreshNavigation() - */ - $("#drop_table_anchor").live('click', function(event) { - event.preventDefault(); - - /** - * @var question String containing the question to be asked for confirmation - */ - var question = 'DROP TABLE/VIEW ' + window.parent.table; - $(this).PMA_confirm(question, $(this).attr('href'), function(url) { - - PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); - $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) { - if(data.success == true) { - PMA_ajaxShowMessage(data.message); - $("#topmenucontainer") - .next('div') - .remove() - .end() - .after(data.sql_query); - window.parent.table = ''; - if (window.parent && window.parent.frame_navigation) { - window.parent.frame_navigation.location.reload(); - } - } - else { - PMA_ajaxShowMessage(data.error); - } - }) // end $.get - }) // end $.PMA_confirm() - }) // end $().live() -}, 'top.frame_content'); //end $(document).ready() for libraries/tbl_links.inc.php - -/** * Attach Ajax event handlers for Drop Trigger. Used on tbl_structure.php */ $(document).ready(function() { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1559-g879864b
by Michal Čihař 01 Feb '11

01 Feb '11

The branch, master has been updated via 879864b300ae3118e0e9bb5142c0f3da77807346 (commit) via 040ce81e4a8dfe418a480c1fe86c7272688fd25d (commit) via 61557a93c88e172101cdd02d48282d0faa9baafd (commit) via 22d7c1e6e8cccb2209b51632e7644143b2f19bef (commit) via 13f190280de8c6b4077436c1e3f989fa8edf3666 (commit) via 25e3f69a4b6d9a0e9bd5416d825a746fe7aaff4c (commit) via e6c41481cd17a47715c84a27957bfb881c5367d0 (commit) via 4da90822a24f00a00fd7c7950315042e0d96b8b4 (commit) via e7c18b48086e1f5118ed6ecfbc5d82596be71348 (commit) via 98cb0bf771f2c2dc5fb6e761eec516794ac04c05 (commit) via 1e8fc55da11a037160cb9ffc2a7eeda8a9baada9 (commit) via c2615c7570ecd826d4445e2c29828cfd61c3bd9d (commit) via d091d6ca3a223e9a20a550b70bd82c1f1b45fcd3 (commit) via 615d5b43b1b69be8b062cc7391ae8aa4b64f6407 (commit) via 3990bfc516be8f0801d5280faa3460353d029952 (commit) via 18d492d23cf4bea1e1ee36e9d7159ab8a074ecbe (commit) from c199f6b8bd1e909370b7f091fbb36e3ec092c978 (commit) - Log ----------------------------------------------------------------- commit 879864b300ae3118e0e9bb5142c0f3da77807346 Merge: 040ce81e4a8dfe418a480c1fe86c7272688fd25d c199f6b8bd1e909370b7f091fbb36e3ec092c978 Author: Pootle server <pootle(a)cihar.com> Date: Tue Feb 1 08:40:27 2011 +0100 Merge remote branch 'origin/master' commit 040ce81e4a8dfe418a480c1fe86c7272688fd25d Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 19:41:19 2011 +0200 Translation update done using Pootle. commit 61557a93c88e172101cdd02d48282d0faa9baafd Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 19:41:05 2011 +0200 Translation update done using Pootle. commit 22d7c1e6e8cccb2209b51632e7644143b2f19bef Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 19:40:41 2011 +0200 Translation update done using Pootle. commit 13f190280de8c6b4077436c1e3f989fa8edf3666 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 19:40:18 2011 +0200 Translation update done using Pootle. commit 25e3f69a4b6d9a0e9bd5416d825a746fe7aaff4c Merge: e6c41481cd17a47715c84a27957bfb881c5367d0 1e84e0b7bc097d330e84bf2edb147f8fafb4a9cf Author: Pootle server <pootle(a)cihar.com> Date: Mon Jan 31 18:40:05 2011 +0100 Merge remote branch 'origin/master' commit e6c41481cd17a47715c84a27957bfb881c5367d0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 19:39:58 2011 +0200 Translation update done using Pootle. commit 4da90822a24f00a00fd7c7950315042e0d96b8b4 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 19:39:33 2011 +0200 Translation update done using Pootle. commit e7c18b48086e1f5118ed6ecfbc5d82596be71348 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 19:39:15 2011 +0200 Translation update done using Pootle. commit 98cb0bf771f2c2dc5fb6e761eec516794ac04c05 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 19:31:51 2011 +0200 Translation update done using Pootle. commit 1e8fc55da11a037160cb9ffc2a7eeda8a9baada9 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 19:31:46 2011 +0200 Translation update done using Pootle. commit c2615c7570ecd826d4445e2c29828cfd61c3bd9d Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 19:31:41 2011 +0200 Translation update done using Pootle. commit d091d6ca3a223e9a20a550b70bd82c1f1b45fcd3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 19:31:33 2011 +0200 Translation update done using Pootle. commit 615d5b43b1b69be8b062cc7391ae8aa4b64f6407 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 19:31:28 2011 +0200 Translation update done using Pootle. commit 3990bfc516be8f0801d5280faa3460353d029952 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 19:31:22 2011 +0200 Translation update done using Pootle. commit 18d492d23cf4bea1e1ee36e9d7159ab8a074ecbe Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 19:31:15 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 17 ++++++++++------- po/fr.po | 17 ++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 891913e..591f3b4 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-31 15:47+0100\n" -"PO-Revision-Date: 2011-01-31 15:04+0200\n" +"PO-Revision-Date: 2011-01-31 19:31+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" "Language: en_GB\n" @@ -5102,20 +5102,21 @@ msgid "" "Documentation and further information about PBMS can be found on %sThe " "PrimeBase Media Streaming home page%s." msgstr "" +"Documentation and further information about PBMS can be found on %sThe " +"PrimeBase Media Streaming home page%s." #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127 -#, fuzzy #| msgid "Relations" msgid "Related Links" -msgstr "Relations" +msgstr "Related Links" #: libraries/engines/pbms.lib.php:98 msgid "The PrimeBase Media Streaming Blog by Barry Leslie" -msgstr "" +msgstr "The PrimeBase Media Streaming Blog by Barry Leslie" #: libraries/engines/pbms.lib.php:99 msgid "PrimeBase XT Home Page" -msgstr "" +msgstr "PrimeBase XT Home Page" #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" @@ -5271,14 +5272,16 @@ msgid "" "Documentation and further information about PBXT can be found on the " "%sPrimeBase XT Home Page%s." msgstr "" +"Documentation and further information about PBXT can be found on the %" +"sPrimeBase XT Home Page%s." #: libraries/engines/pbxt.lib.php:129 msgid "The PrimeBase XT Blog by Paul McCullagh" -msgstr "" +msgstr "The PrimeBase XT Blog by Paul McCullagh" #: libraries/engines/pbxt.lib.php:130 msgid "The PrimeBase Media Streaming (PBMS) home page" -msgstr "" +msgstr "The PrimeBase Media Streaming (PBMS) home page" #: libraries/export/csv.php:21 libraries/import/csv.php:27 msgid "Columns separated with:" diff --git a/po/fr.po b/po/fr.po index 84a929f..f8e2772 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-31 15:47+0100\n" -"PO-Revision-Date: 2011-01-31 15:05+0200\n" +"PO-Revision-Date: 2011-01-31 19:41+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "Language: fr\n" @@ -5169,20 +5169,21 @@ msgid "" "Documentation and further information about PBMS can be found on %sThe " "PrimeBase Media Streaming home page%s." msgstr "" +"La documentation de PBMS et des informations additionnelles sont disponibles " +"sur %sle site de PrimeBase Media Streaming%s." #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127 -#, fuzzy #| msgid "Relations" msgid "Related Links" -msgstr "Relations" +msgstr "Liens connexes" #: libraries/engines/pbms.lib.php:98 msgid "The PrimeBase Media Streaming Blog by Barry Leslie" -msgstr "" +msgstr "Le blogue PrimeBase Media Streaming par Barry Leslie" #: libraries/engines/pbms.lib.php:99 msgid "PrimeBase XT Home Page" -msgstr "" +msgstr "Le site de PrimeBase XT" #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" @@ -5342,14 +5343,16 @@ msgid "" "Documentation and further information about PBXT can be found on the " "%sPrimeBase XT Home Page%s." msgstr "" +"La documentation de PBXT et des informations additionnelles sont disponibles " +"sur %sle site de PrimeBase XT%s." #: libraries/engines/pbxt.lib.php:129 msgid "The PrimeBase XT Blog by Paul McCullagh" -msgstr "" +msgstr "Le blogue de PrimeBase XT par Paul McCullagh" #: libraries/engines/pbxt.lib.php:130 msgid "The PrimeBase Media Streaming (PBMS) home page" -msgstr "" +msgstr "Le site PrimeBase Media Streaming (PBMS)" #: libraries/export/csv.php:21 libraries/import/csv.php:27 msgid "Columns separated with:" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1543-gc199f6b
by Madhura Jayaratne 01 Feb '11

01 Feb '11

The branch, master has been updated via c199f6b8bd1e909370b7f091fbb36e3ec092c978 (commit) via 2cbabfd56f0a45d2bb76e7181850e568a381359d (commit) via 36e8a23b87afeb905ec36201dc16d2fa38d4dae5 (commit) from 1e84e0b7bc097d330e84bf2edb147f8fafb4a9cf (commit) - Log ----------------------------------------------------------------- commit c199f6b8bd1e909370b7f091fbb36e3ec092c978 Merge: 2cbabfd56f0a45d2bb76e7181850e568a381359d 1e84e0b7bc097d330e84bf2edb147f8fafb4a9cf Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Feb 1 11:49:45 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 2cbabfd56f0a45d2bb76e7181850e568a381359d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Feb 1 11:47:22 2011 +0530 Work around for Bug #3168569 - Issue on toggling the 'Hide search criteria' in chrome. commit 36e8a23b87afeb905ec36201dc16d2fa38d4dae5 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Feb 1 11:37:51 2011 +0530 Bug #3152931 ENUM and SET cannot have 'Binary' option. Avoid wrong categorization to binary, blob and char types. ----------------------------------------------------------------------- Summary of changes: js/tbl_select.js | 5 ++++- tbl_change.php | 33 +++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/js/tbl_select.js b/js/tbl_select.js index 700d0cb..47457ed 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -70,7 +70,10 @@ $(document).ready(function() { // found results $("#sqlqueryresults").html(response); $("#sqlqueryresults").trigger('appendAnchor'); - $('#tbl_search_form').hide(); + $('#tbl_search_form') + // work around for bug #3168569 - Issue on toggling the "Hide search criteria" in chrome. + .slideToggle() + .hide(); $('#togglesearchformlink') // always start with the Show message .text(PMA_messages['strShowSearchCriteria']) diff --git a/tbl_change.php b/tbl_change.php index 2ce434d..2d4bcd8 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -370,10 +370,31 @@ foreach ($rows as $row_id => $vrow) { $table_fields[$i]['Field_title'] = $table_fields[$i]['Field_html']; } - // The type column - $table_fields[$i]['is_binary'] = stristr($table_fields[$i]['Type'], 'binary'); - $table_fields[$i]['is_blob'] = stristr($table_fields[$i]['Type'], 'blob'); - $table_fields[$i]['is_char'] = stristr($table_fields[$i]['Type'], 'char'); + // The type column. + // Fix for bug #3152931 'ENUM and SET cannot have "Binary" option' + // If check to ensure types such as "enum('one','two','binary',..)" or + // "enum('one','two','varbinary',..)" are not categorized as binary. + if (stripos($table_fields[$i]['Type'], 'binary') === 0 + || stripos($table_fields[$i]['Type'], 'varbinary') === 0) { + $table_fields[$i]['is_binary'] = stristr($table_fields[$i]['Type'], 'binary'); + } + + // If check to ensure types such as "enum('one','two','blob',..)" or + // "enum('one','two','tinyblob',..)" etc. are not categorized as blob. + if (stripos($table_fields[$i]['Type'], 'blob') === 0 + || stripos($table_fields[$i]['Type'], 'tinyblob') === 0 + || stripos($table_fields[$i]['Type'], 'mediumblob') === 0 + || stripos($table_fields[$i]['Type'], 'longblob') === 0) { + $table_fields[$i]['is_blob'] = stristr($table_fields[$i]['Type'], 'blob'); + } + + // If check to ensure types such as "enum('one','two','char',..)" or + // "enum('one','two','varchar',..)" are not categorized as char. + if (stripos($table_fields[$i]['Type'], 'char') === 0 + || stripos($table_fields[$i]['Type'], 'varchar') === 0) { + $table_fields[$i]['is_char'] = stristr($table_fields[$i]['Type'], 'char'); + } + $table_fields[$i]['first_timestamp'] = false; switch ($table_fields[$i]['True_Type']) { case 'set': @@ -616,7 +637,7 @@ foreach ($rows as $row_id => $vrow) { echo ' checked="checked"'; } echo ' id="field_' . ($idindex) . '_2" />'; - + // nullify_code is needed by the js nullify() function if (strstr($field['True_Type'], 'enum')) { if (strlen($field['Type']) > 20) { @@ -635,7 +656,7 @@ foreach ($rows as $row_id => $vrow) { } else { $nullify_code = '5'; } - // to be able to generate calls to nullify() in jQuery + // to be able to generate calls to nullify() in jQuery echo '<input type="hidden" class="nullify_code" name="nullify_code' . $field_name_appendix . '" value="' . $nullify_code . '" />'; echo '<input type="hidden" class="hashed_field" name="hashed_field' . $field_name_appendix . '" value="' . $field['Field_md5'] . '" />'; echo '<input type="hidden" class="multi_edit" name="multi_edit' . $field_name_appendix . '" value="' . PMA_escapeJsString($vkey) . '" />'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. dc5d770b8de7d7c86bb8d3e9de89e2fff5636827
by Michal Čihař 31 Jan '11

31 Jan '11

The branch, master has been updated via dc5d770b8de7d7c86bb8d3e9de89e2fff5636827 (commit) from 89a6183f2bdb7c1e7df9d6d0ad215ca35e3b7a78 (commit) - Log ----------------------------------------------------------------- commit dc5d770b8de7d7c86bb8d3e9de89e2fff5636827 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jan 31 22:27:20 2011 +0100 Use correct project on Flattr. ----------------------------------------------------------------------- Summary of changes: templates/donate.tpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/donate.tpl b/templates/donate.tpl index acab3e3..9efd06f 100644 --- a/templates/donate.tpl +++ b/templates/donate.tpl @@ -10,7 +10,7 @@ We invite you to <a href="https://sourceforge.net/donate/index.php?group_id=23067" rel="payment">contribute money</a> to our project (or just send money using PayPal to donate(a)phpmyadmin.net) </p> <p> -Alternatively you can appreciate our work using <a href="https://flattr.com/thing/98525/phpMyAdmin">Flattr</a>. +Alternatively you can appreciate our work using <a href="https://flattr.com/thing/56976/phpMyAdmin">Flattr</a>. </p> <p> Donations will be used for the promotion of phpMyAdmin, mostly by allowing team members to visit various conferences. Thanks. hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1540-g1e84e0b
by Marc Delisle 31 Jan '11

31 Jan '11

The branch, master has been updated via 1e84e0b7bc097d330e84bf2edb147f8fafb4a9cf (commit) from 98187c115be0d97ec22fda174115c1235f2b6b7b (commit) - Log ----------------------------------------------------------------- commit 1e84e0b7bc097d330e84bf2edb147f8fafb4a9cf Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 12:26:42 2011 -0500 Typo in FAQ number ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index 1ba09a1..ca12d95 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4311,7 +4311,7 @@ chmod o+rwx tmp </p> <h4 id="faq6_29"> - <a href="#faq6_29">6.28 Why can't I get a chart from my query result table?</a></h4> + <a href="#faq6_29">6.29 Why can't I get a chart from my query result table?</a></h4> <p> Not every table can be put to the chart. Only tables with one, two or three columns can be visualised as a chart. Moreover the table must be in a special format for chart script to understand it. Currently supported formats can be found in the <a href="http://wiki.phpmyadmin.net/pma/Devel:Charts#Data_formats_for_query_results_…">wiki</a>.</p> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1539-g98187c1
by Michal Čihař 31 Jan '11

31 Jan '11

The branch, master has been updated via 98187c115be0d97ec22fda174115c1235f2b6b7b (commit) from 9ff2452f2bf2f937e2ac29d8eafb3ac15c90ac24 (commit) - Log ----------------------------------------------------------------- commit 98187c115be0d97ec22fda174115c1235f2b6b7b Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jan 31 16:47:27 2011 +0100 Fix typo ----------------------------------------------------------------------- Summary of changes: po/cs.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/cs.po b/po/cs.po index ffc4808..b191e81 100644 --- a/po/cs.po +++ b/po/cs.po @@ -377,7 +377,7 @@ msgstr "právě se používá" #: libraries/schema/Pdf_Relation_Schema.class.php:1215 tbl_printview.php:431 #: tbl_structure.php:901 msgid "Creation" -msgstr "Vytvoření" +msgstr "Vytvořeno" #: db_printview.php:194 libraries/db_info.inc.php:91 #: libraries/export/sql.php:584 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1538-g9ff2452
by Michal Čihař 31 Jan '11

31 Jan '11

The branch, master has been updated via 9ff2452f2bf2f937e2ac29d8eafb3ac15c90ac24 (commit) from 26adb958dcec943dfb714217e086455b06a06aaa (commit) - Log ----------------------------------------------------------------- commit 9ff2452f2bf2f937e2ac29d8eafb3ac15c90ac24 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jan 31 15:51:36 2011 +0100 Czech translation update ----------------------------------------------------------------------- Summary of changes: po/cs.po | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/po/cs.po b/po/cs.po index 968e352..ffc4808 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-31 15:47+0100\n" -"PO-Revision-Date: 2011-01-31 15:38+0100\n" +"PO-Revision-Date: 2011-01-31 15:51+0100\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -5115,20 +5115,21 @@ msgid "" "Documentation and further information about PBMS can be found on %sThe " "PrimeBase Media Streaming home page%s." msgstr "" +"Dokumentace a další informace o PBMS můžete nalézt na %sstránkách PrimeBase " +"Media Streaming%s." #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127 -#, fuzzy #| msgid "Relations" msgid "Related Links" -msgstr "Relace" +msgstr "Související odkazy" #: libraries/engines/pbms.lib.php:98 msgid "The PrimeBase Media Streaming Blog by Barry Leslie" -msgstr "" +msgstr "Blog PrimeBase Media Streaming Blog, který píše Barry Leslie" #: libraries/engines/pbms.lib.php:99 msgid "PrimeBase XT Home Page" -msgstr "" +msgstr "Domovská stránka PrimeBase XT" #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" @@ -5285,14 +5286,16 @@ msgid "" "Documentation and further information about PBXT can be found on the " "%sPrimeBase XT Home Page%s." msgstr "" +"Dokumentace a další informace o PBXT můžete nalézt na %sstránkách PrimeBase " +"XT%s." #: libraries/engines/pbxt.lib.php:129 msgid "The PrimeBase XT Blog by Paul McCullagh" -msgstr "" +msgstr "Blog PrimeBase XT, který píše Paul McCullagh" #: libraries/engines/pbxt.lib.php:130 msgid "The PrimeBase Media Streaming (PBMS) home page" -msgstr "" +msgstr "Domovská stránka PrimeBase Media Streaming (PBMS)" #: libraries/export/csv.php:21 libraries/import/csv.php:27 msgid "Columns separated with:" hooks/post-receive -- phpMyAdmin

1 0