Git June 2010

git@phpmyadmin.net

3 participants
104 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5244-g01d6fed
by Marc Delisle 30 Jun '10

30 Jun '10

The branch, master has been updated via 01d6fed4e2c9594a36d6e688ea26d66946c7b080 (commit) via 108f3305e9b1e5950c8bf7bd49d0f41bec2c1154 (commit) from 63b6abb326a5795850e9dfeb469873db38bc92a4 (commit) - Log ----------------------------------------------------------------- commit 01d6fed4e2c9594a36d6e688ea26d66946c7b080 Merge: 63b6abb326a5795850e9dfeb469873db38bc92a4 108f3305e9b1e5950c8bf7bd49d0f41bec2c1154 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 30 11:37:53 2010 -0400 fix merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/header_scripts.inc.php | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8f0df5..12e1d24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,7 @@ $Id$ - bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible - bug [replication] Do not offer information_schema in the list of databases +- bug [js] Avoid loading twice a js file 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php index 6a4aacb..cb366b5 100644 --- a/libraries/header_scripts.inc.php +++ b/libraries/header_scripts.inc.php @@ -66,6 +66,9 @@ $GLOBALS['js_events'][] = array( * upgrade phpMyAdmin are not stuck with older .js files in their * browser cache. This produces an HTTP 304 request for each file. */ + +// avoid loading twice a js file +$GLOBALS['js_include'] = array_unique($GLOBALS['js_include']); foreach ($GLOBALS['js_include'] as $js_script_file) { if (strpos($js_script_file, '?') === FALSE) { echo '<script src="./js/' . $js_script_file . '?ts=' . filemtime('./js/' . $js_script_file) . '" type="text/javascript"></script>' . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-10-g108f330
by Marc Delisle 30 Jun '10

30 Jun '10

The branch, QA_3_3 has been updated via 108f3305e9b1e5950c8bf7bd49d0f41bec2c1154 (commit) from b2fdf039db1ec34aea802b722bf5ce51b12c1f0b (commit) - Log ----------------------------------------------------------------- commit 108f3305e9b1e5950c8bf7bd49d0f41bec2c1154 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 30 11:35:46 2010 -0400 bug: avoid loading twice a js file ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/header_scripts.inc.php | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66873fb..eaa81ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible - bug [replication] Do not offer information_schema in the list of databases +- bug [js] Avoid loading twice a js file 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php index faf8cc8..0725411 100644 --- a/libraries/header_scripts.inc.php +++ b/libraries/header_scripts.inc.php @@ -112,6 +112,8 @@ $GLOBALS['js_events'][] = array( 'function' => 'PMA_TT_init', ); +// avoid loading twice a js file +$GLOBALS['js_include'] = array_unique($GLOBALS['js_include']); foreach ($GLOBALS['js_include'] as $js_script_file) { echo '<script src="./js/' . $js_script_file . '" type="text/javascript"></script>' . "\n"; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5242-g63b6abb
by Marc Delisle 30 Jun '10

30 Jun '10

The branch, master has been updated via 63b6abb326a5795850e9dfeb469873db38bc92a4 (commit) via b2fdf039db1ec34aea802b722bf5ce51b12c1f0b (commit) from 0f9dfaca8605b9aa1f01bee92ada6d482d3f2886 (commit) - Log ----------------------------------------------------------------- commit 63b6abb326a5795850e9dfeb469873db38bc92a4 Merge: 0f9dfaca8605b9aa1f01bee92ada6d482d3f2886 b2fdf039db1ec34aea802b722bf5ce51b12c1f0b Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 30 09:36:11 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: Documentation.html | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 460915a..3c12424 100644 --- a/Documentation.html +++ b/Documentation.html @@ -946,7 +946,8 @@ since this link provides funding for phpMyAdmin. table. To allow the usage of this functionality: <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <li>put the table name in - <tt>$cfg['Servers'][$i]['table_info']</tt></li> + <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g. + 'pma_table_info')</li> <li>then for each table where you want to use this feature, click "Structure/Relation view/Choose column to display" to choose the column.</li> @@ -1005,7 +1006,8 @@ since this link provides funding for phpMyAdmin. <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <li>put the table name in - <tt>$cfg['Servers'][$i]['column_info']</tt></li> + <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g. + 'pma_column_info')</li> <li>to update your PRE-2.5.0 Column_comments Table use this: <pre> @@ -1045,6 +1047,7 @@ ALTER TABLE `pma_column_comments` <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt> + (e.g. 'pma_history') </li> </ul> </dd> @@ -1075,7 +1078,7 @@ ALTER TABLE `pma_column_comments` <ul> <li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt></li> + <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. 'pma_tracking')</li> </ul> </dd> @@ -1147,7 +1150,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> + <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. 'pma_designer_coords') </li> </ul> </dd> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-9-gb2fdf03
by Marc Delisle 30 Jun '10

30 Jun '10

The branch, QA_3_3 has been updated via b2fdf039db1ec34aea802b722bf5ce51b12c1f0b (commit) from 852ed51c27f35ec942440e0330318775d8e4c91d (commit) - Log ----------------------------------------------------------------- commit b2fdf039db1ec34aea802b722bf5ce51b12c1f0b Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 30 09:35:44 2010 -0400 clarify what is meant by "put the table name" ----------------------------------------------------------------------- Summary of changes: Documentation.html | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 6dff5d4..bd086d7 100644 --- a/Documentation.html +++ b/Documentation.html @@ -935,7 +935,8 @@ since this link provides funding for phpMyAdmin. table. To allow the usage of this functionality: <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <li>put the table name in - <tt>$cfg['Servers'][$i]['table_info']</tt></li> + <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g. + 'pma_table_info')</li> <li>then for each table where you want to use this feature, click "Structure/Relation view/Choose field to display" to choose the field.</li> @@ -994,7 +995,8 @@ since this link provides funding for phpMyAdmin. <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <li>put the table name in - <tt>$cfg['Servers'][$i]['column_info']</tt></li> + <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g. + 'pma_column_info')</li> <li>to update your PRE-2.5.0 Column_comments Table use this: <pre> @@ -1034,6 +1036,7 @@ ALTER TABLE `pma_column_comments` <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt> + (e.g. 'pma_history') </li> </ul> </dd> @@ -1064,7 +1067,7 @@ ALTER TABLE `pma_column_comments` <ul> <li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt></li> + <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. 'pma_tracking')</li> </ul> </dd> @@ -1136,7 +1139,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> + <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. 'pma_designer_coords') </li> </ul> </dd> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5240-g0f9dfac
by Michal Čihař 30 Jun '10

30 Jun '10

The branch, master has been updated via 0f9dfaca8605b9aa1f01bee92ada6d482d3f2886 (commit) via 8178aac0186e2ca642764eaf3c204175f471fd34 (commit) from 116d1297afb96638650649a644cf59d4774dd66b (commit) - Log ----------------------------------------------------------------- commit 0f9dfaca8605b9aa1f01bee92ada6d482d3f2886 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 29 22:42:58 2010 +0200 Translation update done using Pootle. commit 8178aac0186e2ca642764eaf3c204175f471fd34 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 29 22:42:42 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sl.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index e47e1c2..4cbdd2e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-06-13 09:03-0400\n" -"PO-Revision-Date: 2010-06-17 01:10+0200\n" +"PO-Revision-Date: 2010-06-29 22:42+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" "Language: sl\n" @@ -193,7 +193,7 @@ msgstr "Natisni" #: db_export.php:29 msgid "View dump (schema) of database" -msgstr "Preglej povzetek stanja podatkovne baze" +msgstr "Preglej povzetek stanja podatkovne zbirke" #: db_export.php:33 db_printview.php:96 db_qbe.php:102 db_structure.php:51 #: db_tracking.php:35 export.php:359 navigation.php:332 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5238-g116d129
by Marc Delisle 29 Jun '10

29 Jun '10

The branch, master has been updated via 116d1297afb96638650649a644cf59d4774dd66b (commit) via 852ed51c27f35ec942440e0330318775d8e4c91d (commit) via f463b1cc7a87e8a7e69ee67d942cae34f4ac37ff (commit) from f368184a12c2fc619ef442e588e07be58c3c6085 (commit) - Log ----------------------------------------------------------------- commit 116d1297afb96638650649a644cf59d4774dd66b Merge: f368184a12c2fc619ef442e588e07be58c3c6085 852ed51c27f35ec942440e0330318775d8e4c91d Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 29 08:23:47 2010 -0400 solve merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/replication_gui.lib.php | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7772727..f8f0df5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,7 @@ $Id$ databases, thanks to Stéphane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible +- bug [replication] Do not offer information_schema in the list of databases 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index db41b20..a975bee 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -20,6 +20,9 @@ function PMA_replication_db_multibox() $multi_values .= '<select name="db_select[]" size="6" multiple="multiple" id="db_select">'; foreach ($GLOBALS['pma']->databases as $current_db) { + if ('information_schema' == $current_db) { + continue; + } if (! empty($selectall) || (isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))) { $is_selected = ' selected="selected"'; } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-8-g852ed51
by Marc Delisle 29 Jun '10

29 Jun '10

The branch, QA_3_3 has been updated via 852ed51c27f35ec942440e0330318775d8e4c91d (commit) from f463b1cc7a87e8a7e69ee67d942cae34f4ac37ff (commit) - Log ----------------------------------------------------------------- commit 852ed51c27f35ec942440e0330318775d8e4c91d Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 29 08:14:31 2010 -0400 bug [replication] Do not offer information_schema in the list of databases ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/replication_gui.lib.php | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7cdba96..66873fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA databases, thanks to Stéphane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible +- bug [replication] Do not offer information_schema in the list of databases 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index d772800..b5f14ad 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -72,6 +72,9 @@ function PMA_replication_db_multibox() $multi_values .= '<select name="db_select[]" size="6" multiple="multiple" id="db_select">'; foreach ($GLOBALS['pma']->databases as $current_db) { + if ('information_schema' == $current_db) { + continue; + } if (! empty($selectall) || (isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))) { $is_selected = ' selected="selected"'; } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5235-gf368184
by Marc Delisle 29 Jun '10

29 Jun '10

The branch, master has been updated via f368184a12c2fc619ef442e588e07be58c3c6085 (commit) from 90ac3d39a03235593b0952864bfd1e14139cc37c (commit) - Log ----------------------------------------------------------------- commit f368184a12c2fc619ef442e588e07be58c3c6085 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 29 07:57:45 2010 -0400 fix typo; remove Id ----------------------------------------------------------------------- Summary of changes: libraries/display_import.lib.php | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 318dd34..dd9f650 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { @@ -94,7 +93,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { window.setTimeout(perform_upload, 1000); <?php -} else { // no plugin avaliable +} 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').css("display", "none"); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5234-g90ac3d3
by Marc Delisle 29 Jun '10

29 Jun '10

The branch, master has been updated via 90ac3d39a03235593b0952864bfd1e14139cc37c (commit) from 16ed06531a00ebac5bd33b40fbdb8139639f726c (commit) - Log ----------------------------------------------------------------- commit 90ac3d39a03235593b0952864bfd1e14139cc37c Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 29 07:56:10 2010 -0400 bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/display_import.lib.php | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7492e73..7772727 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,8 @@ $Id$ 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker +- bug #3022705 [import] Import button does not work in Catalan when there + is no progress bar possible 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 923d962..318dd34 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -96,7 +96,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { <?php } else { // no plugin avaliable ?> - $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo __('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.')) . 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_3, updated. RELEASE_3_3_4-7-gf463b1c
by Marc Delisle 29 Jun '10

29 Jun '10

The branch, QA_3_3 has been updated via f463b1cc7a87e8a7e69ee67d942cae34f4ac37ff (commit) from f70bd16ce3e34877c6c07087b649ad3b5241e0c0 (commit) - Log ----------------------------------------------------------------- commit f463b1cc7a87e8a7e69ee67d942cae34f4ac37ff Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 29 07:48:28 2010 -0400 bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/display_import.lib.php | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1840c48..7cdba96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker +- bug #3022705 [import] Import button does not work in Catalan when there + is no progress bar possible 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 4d40692..b5eab10 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -98,7 +98,7 @@ window.addEvent('domready', function() { <?php } else { ?> - $('upload_form_status_info').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo $strImportUploadInfoNotAvailable . PMA_showDocu('faq2_9'); ?>'); + $('upload_form_status_info').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat($strImportUploadInfoNotAvailable) . PMA_showDocu('faq2_9'); ?>'); $('upload_form_status').setStyle("display", "none"); <?php } // else hooks/post-receive -- phpMyAdmin

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git June 2010