Git

git@phpmyadmin.net

13 participants
38228 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA1-1130-g1199f7a
by Marc Delisle 28 Nov '10

28 Nov '10

The branch, master has been updated via 1199f7a3db301ef7b0bd20ef0d3805fd3415be9b (commit) via ae764b973f6f07019824ab4a109f6cde96adec0e (commit) via 36337ff8deec0271ea98d9e5495ddc753cbbe4b7 (commit) via 412377ca52f56675db13d3bd1627ae82dc1d02e7 (commit) from 0d6cc8ca55a278ae4f2b671f33ae5029701fe705 (commit) - Log ----------------------------------------------------------------- commit 1199f7a3db301ef7b0bd20ef0d3805fd3415be9b Merge: 0d6cc8ca55a278ae4f2b671f33ae5029701fe705 ae764b973f6f07019824ab4a109f6cde96adec0e Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 28 08:16:37 2010 -0500 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ navigation.php | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f01a96b..04aa753 100644 --- a/ChangeLog +++ b/ChangeLog @@ -122,6 +122,8 @@ - bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character. + rfe #3111455 [interface] Column highlighting and marking in table view + Visual query builder +- patch #3112792 [navi] Left panel table grouping incorrect, + thanks to garas - garas 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc diff --git a/navigation.php b/navigation.php index bebdb19..a45277c 100644 --- a/navigation.php +++ b/navigation.php @@ -606,7 +606,7 @@ function PMA_displayTableList($tables, $visible = false, echo '</li>' . "\n"; } elseif (is_array($table)) { // the table was not grouped because it is the only one with its prefix - if (isset($table['is' . $sep . 'group'])) { + while (isset($table['is' . $sep . 'group'])) { // get the array with the actual table information foreach ($table as $value) { if(is_array($value)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0ALPHA1-550-gae764b9
by Marc Delisle 28 Nov '10

28 Nov '10

The branch, QA_3_4 has been updated via ae764b973f6f07019824ab4a109f6cde96adec0e (commit) from 36337ff8deec0271ea98d9e5495ddc753cbbe4b7 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ navigation.php | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c120c04..8f641ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -122,6 +122,8 @@ - bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character. + rfe #3111455 [interface] Column highlighting and marking in table view + Visual query builder +- patch #3112792 [navi] Left panel table grouping incorrect, + thanks to garas - garas 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc diff --git a/navigation.php b/navigation.php index bebdb19..a45277c 100644 --- a/navigation.php +++ b/navigation.php @@ -606,7 +606,7 @@ function PMA_displayTableList($tables, $visible = false, echo '</li>' . "\n"; } elseif (is_array($table)) { // the table was not grouped because it is the only one with its prefix - if (isset($table['is' . $sep . 'group'])) { + while (isset($table['is' . $sep . 'group'])) { // get the array with the actual table information foreach ($table as $value) { if(is_array($value)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0ALPHA1-534-ga3ae93f
by Marc Delisle 28 Nov '10

28 Nov '10

The branch, MAINT_3_4_0 has been updated via a3ae93f7768cbb4eb91a2473cdce0dc4936407f1 (commit) from 5467dab20909e17fef854fea1e5c626d119c76b7 (commit) - Log ----------------------------------------------------------------- commit a3ae93f7768cbb4eb91a2473cdce0dc4936407f1 Author: garas <garas(a)users.sourceforge.net> Date: Sun Nov 28 08:12:22 2010 -0500 patch #3112792 [navi] Left panel table grouping incorrect ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ navigation.php | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9e6a34..5895330 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,6 +121,8 @@ + rfe #3111455 [interface] Column highlighting and marking in table view + Visual query builder - bug #3115519 [interface] Prevent long queries from being shown in confirmation popup +- patch #3112792 [navi] Left panel table grouping incorrect, + thanks to garas - garas 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc diff --git a/navigation.php b/navigation.php index bebdb19..a45277c 100644 --- a/navigation.php +++ b/navigation.php @@ -606,7 +606,7 @@ function PMA_displayTableList($tables, $visible = false, echo '</li>' . "\n"; } elseif (is_array($table)) { // the table was not grouped because it is the only one with its prefix - if (isset($table['is' . $sep . 'group'])) { + while (isset($table['is' . $sep . 'group'])) { // get the array with the actual table information foreach ($table as $value) { if(is_array($value)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA1-1126-g0d6cc8c
by Marc Delisle 28 Nov '10

28 Nov '10

The branch, master has been updated via 0d6cc8ca55a278ae4f2b671f33ae5029701fe705 (commit) from 586279a0af1f7915451470dd6e8a561963be1d52 (commit) - Log ----------------------------------------------------------------- commit 0d6cc8ca55a278ae4f2b671f33ae5029701fe705 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 28 07:40:29 2010 -0500 bug #3119884, path not found (in case the kit is English-only) ----------------------------------------------------------------------- Summary of changes: libraries/select_lang.lib.php | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index f1a3725..3ed35e4 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -343,10 +343,8 @@ function PMA_langList() /* Open the directory */ $handle = @opendir($GLOBALS['lang_path']); + /* This can happen if the kit is English-only */ if ($handle === FALSE) { - trigger_error('phpMyAdmin: path not found: ' - . $GLOBALS['lang_path'] . ', check your language directory.', - E_USER_WARNING); return $result; } @@ -363,7 +361,7 @@ function PMA_langList() } /** - * @global string path to the translations directory + * @global string path to the translations directory; may be absent if the kit is English-only */ $GLOBALS['lang_path'] = './locale/'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0ALPHA1-549-g36337ff
by Marc Delisle 28 Nov '10

28 Nov '10

The branch, QA_3_4 has been updated via 36337ff8deec0271ea98d9e5495ddc753cbbe4b7 (commit) from 412377ca52f56675db13d3bd1627ae82dc1d02e7 (commit) - Log ----------------------------------------------------------------- commit 36337ff8deec0271ea98d9e5495ddc753cbbe4b7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 28 07:40:29 2010 -0500 bug #3119884, path not found (in case the kit is English-only) ----------------------------------------------------------------------- Summary of changes: libraries/select_lang.lib.php | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index f1a3725..3ed35e4 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -343,10 +343,8 @@ function PMA_langList() /* Open the directory */ $handle = @opendir($GLOBALS['lang_path']); + /* This can happen if the kit is English-only */ if ($handle === FALSE) { - trigger_error('phpMyAdmin: path not found: ' - . $GLOBALS['lang_path'] . ', check your language directory.', - E_USER_WARNING); return $result; } @@ -363,7 +361,7 @@ function PMA_langList() } /** - * @global string path to the translations directory + * @global string path to the translations directory; may be absent if the kit is English-only */ $GLOBALS['lang_path'] = './locale/'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0ALPHA1-533-g5467dab
by Marc Delisle 28 Nov '10

28 Nov '10

The branch, MAINT_3_4_0 has been updated via 5467dab20909e17fef854fea1e5c626d119c76b7 (commit) from fff3afc08e73b1fedafec2490f343bcb3dd541be (commit) - Log ----------------------------------------------------------------- commit 5467dab20909e17fef854fea1e5c626d119c76b7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 28 07:40:29 2010 -0500 bug #3119884, path not found (in case the kit is English-only) ----------------------------------------------------------------------- Summary of changes: libraries/select_lang.lib.php | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index f1a3725..3ed35e4 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -343,10 +343,8 @@ function PMA_langList() /* Open the directory */ $handle = @opendir($GLOBALS['lang_path']); + /* This can happen if the kit is English-only */ if ($handle === FALSE) { - trigger_error('phpMyAdmin: path not found: ' - . $GLOBALS['lang_path'] . ', check your language directory.', - E_USER_WARNING); return $result; } @@ -363,7 +361,7 @@ function PMA_langList() } /** - * @global string path to the translations directory + * @global string path to the translations directory; may be absent if the kit is English-only */ $GLOBALS['lang_path'] = './locale/'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0ALPHA1-532-gfff3afc
by Herman van Rink 26 Nov '10

26 Nov '10

The branch, MAINT_3_4_0 has been updated via fff3afc08e73b1fedafec2490f343bcb3dd541be (commit) from 268628e5ffe7ed2a74d912a43a6e53db186867c2 (commit) - Log ----------------------------------------------------------------- commit fff3afc08e73b1fedafec2490f343bcb3dd541be Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Nov 26 20:55:58 2010 +0100 bug #3115519: Prevent long queries from being shown in confirmation popup ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + db_search.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 994b4fa..d9e6a34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -120,6 +120,7 @@ - bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character. + rfe #3111455 [interface] Column highlighting and marking in table view + Visual query builder +- bug #3115519 [interface] Prevent long queries from being shown in confirmation popup 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc diff --git a/db_search.php b/db_search.php index 6c87f61..10a9a13 100644 --- a/db_search.php +++ b/db_search.php @@ -257,7 +257,7 @@ if (isset($_REQUEST['submit_search'])) { $this_url_params['sql_query'] = $newsearchsqls['delete']; echo '<td>' . PMA_linkOrButton( 'sql.php' . PMA_generate_common_url($this_url_params), - __('Delete'), $newsearchsqls['delete']) . "</td>\n"; + __('Delete'), printf(__('Delete the matches for the "%s" table?'), htmlspecialchars($each_table))) . "</td>\n"; } else { echo '<td> </td>' . "\n" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA1-1125-g586279a
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, master has been updated via 586279a0af1f7915451470dd6e8a561963be1d52 (commit) from bd76d17837234cb2edf8ff82ed91f6b263f5af5d (commit) - Log ----------------------------------------------------------------- commit 586279a0af1f7915451470dd6e8a561963be1d52 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 12:46:51 2010 -0500 missing title ----------------------------------------------------------------------- Summary of changes: libraries/header.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 33531ea..6ce37b8 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -122,7 +122,7 @@ if (!$GLOBALS['is_ajax_request']) { $GLOBALS['cfg']['DefaultTabDatabase'], PMA_generate_common_url($GLOBALS['db']), $GLOBALS['db'], - '', + __('Database'), 's_tbl.png'); // if the table is being dropped, $_REQUEST['purge'] is set // (it always contains "1") hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0ALPHA1-548-g412377c
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, QA_3_4 has been updated via 412377ca52f56675db13d3bd1627ae82dc1d02e7 (commit) from 1486abddef7f4e5e317b4a27fee01849d7b429b0 (commit) - Log ----------------------------------------------------------------- commit 412377ca52f56675db13d3bd1627ae82dc1d02e7 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 12:46:51 2010 -0500 missing title ----------------------------------------------------------------------- Summary of changes: libraries/header.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 33531ea..6ce37b8 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -122,7 +122,7 @@ if (!$GLOBALS['is_ajax_request']) { $GLOBALS['cfg']['DefaultTabDatabase'], PMA_generate_common_url($GLOBALS['db']), $GLOBALS['db'], - '', + __('Database'), 's_tbl.png'); // if the table is being dropped, $_REQUEST['purge'] is set // (it always contains "1") hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0ALPHA1-531-g268628e
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, MAINT_3_4_0 has been updated via 268628e5ffe7ed2a74d912a43a6e53db186867c2 (commit) from 1aff32ac2c5a1f91ce6656970136d34966ca0e4c (commit) - Log ----------------------------------------------------------------- commit 268628e5ffe7ed2a74d912a43a6e53db186867c2 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 12:46:51 2010 -0500 missing title ----------------------------------------------------------------------- Summary of changes: libraries/header.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 33531ea..6ce37b8 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -122,7 +122,7 @@ if (!$GLOBALS['is_ajax_request']) { $GLOBALS['cfg']['DefaultTabDatabase'], PMA_generate_common_url($GLOBALS['db']), $GLOBALS['db'], - '', + __('Database'), 's_tbl.png'); // if the table is being dropped, $_REQUEST['purge'] is set // (it always contains "1") 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