Git

git@phpmyadmin.net

18 participants
38269 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1982-g6c938c0
by Marc Delisle 25 May '11

25 May '11

The branch, master has been updated via 6c938c0f7339b7c7263e0b0e7e055254827b0b1b (commit) from 13f09c03cfa37ba3f05fde015826ce4893158293 (commit) - Log ----------------------------------------------------------------- commit 6c938c0f7339b7c7263e0b0e7e055254827b0b1b Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Wed May 25 09:08:18 2011 +0700 Recent tables: Fix for frame_navigation reference not found ----------------------------------------------------------------------- Summary of changes: js/functions.js | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/js/functions.js b/js/functions.js index f745e8c..0380a3d 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2287,9 +2287,11 @@ $(document).ready(function() { } }); - $('#update_recent_tables').ready(function() { + $('#update_recent_tables').ready(function() { + if (window.parent.frame_navigation != undefined) { window.parent.frame_navigation.PMA_reloadRecentTable(); - }); + } + }); }) // end of $(document).ready() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1981-g13f09c0
by Michal Čihař 25 May '11

25 May '11

The branch, master has been updated via 13f09c03cfa37ba3f05fde015826ce4893158293 (commit) via e3a73f0e7a16611552058b235ab1e1452e731b08 (commit) via 29940ea6b077935c48d2e946c3c41d1063443782 (commit) via 24a77645339b9cb32c524456a10dcd0272fdb926 (commit) via c76187732bea3c95c6beab20229c9584803396f4 (commit) from 4e2cd5e998340f2f7262bc890d64e51c85970937 (commit) - Log ----------------------------------------------------------------- commit 13f09c03cfa37ba3f05fde015826ce4893158293 Merge: 4e2cd5e998340f2f7262bc890d64e51c85970937 e3a73f0e7a16611552058b235ab1e1452e731b08 Author: Michal Čihař <michal(a)cihar.com> Date: Wed May 25 06:55:58 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index a773f8e..b492910 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ locale sources # API documentation apidoc +# Demo server +revision-info.php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-40-ge3a73f0
by Michal Čihař 25 May '11

25 May '11

The branch, QA_3_4 has been updated via e3a73f0e7a16611552058b235ab1e1452e731b08 (commit) from 29940ea6b077935c48d2e946c3c41d1063443782 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index a773f8e..b492910 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ locale sources # API documentation apidoc +# Demo server +revision-info.php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1976-g4e2cd5e
by Piotr Przybylski 24 May '11

24 May '11

The branch, master has been updated via 4e2cd5e998340f2f7262bc890d64e51c85970937 (commit) from 84006bfeb21723a510d42dff929f5cf290b39d9b (commit) - Log ----------------------------------------------------------------- commit 4e2cd5e998340f2f7262bc890d64e51c85970937 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue May 24 18:38:15 2011 +0200 Fix broken column list in index creation Regression from "Remove deprecated function PMA_DBI_get_fields", fe53e42d1dfff53967ef5c3d6930b1bd9ac4b428 ----------------------------------------------------------------------- Summary of changes: tbl_indexes.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_indexes.php b/tbl_indexes.php index 5fcfee9..59ea6b0 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -15,7 +15,7 @@ require_once './libraries/tbl_common.php'; // Get fields and stores their name/type $fields = array(); -foreach (PMA_DBI_get_columns($db, $table) as $row) { +foreach (PMA_DBI_get_columns_full($db, $table) as $row) { if (preg_match('@^(set|enum)$(.+)$$@i', $row['Type'], $tmp)) { $tmp[2] = substr(preg_replace('@([^,])\'\'@', '\\1\\\'', ',' . $tmp[2]), 1); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1975-g84006bf
by Marc Delisle 24 May '11

24 May '11

The branch, master has been updated via 84006bfeb21723a510d42dff929f5cf290b39d9b (commit) from 468238bd0801f4d8b7a7fdeb435debecca89a985 (commit) - Log ----------------------------------------------------------------- commit 84006bfeb21723a510d42dff929f5cf290b39d9b Author: Marc Delisle <marc(a)infomarc.info> Date: Tue May 24 10:51:26 2011 -0400 Put back the div that was generated by previous slider ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index febfbf4..e2a436d 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -706,6 +706,7 @@ if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' != $tbl_type) { // BEGIN - Calc Table Space // Get valid statistics whatever is the table type if ($cfg['ShowStats']) { + echo '<div id="tablestatistics">'; if (empty($showtable)) { $showtable = PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], null, true); } @@ -924,7 +925,7 @@ if ($cfg['ShowStats']) { </tbody> </table> -  +  </div> <?php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-39-g29940ea
by Marc Delisle 24 May '11

24 May '11

The branch, QA_3_4 has been updated via 29940ea6b077935c48d2e946c3c41d1063443782 (commit) from 24a77645339b9cb32c524456a10dcd0272fdb926 (commit) - Log ----------------------------------------------------------------- commit 29940ea6b077935c48d2e946c3c41d1063443782 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue May 24 10:51:26 2011 -0400 Put back the div that was generated by previous slider ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index bb4cc06..ffdb0d2 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -706,6 +706,7 @@ if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' != $tbl_type) { // BEGIN - Calc Table Space // Get valid statistics whatever is the table type if ($cfg['ShowStats']) { + echo '<div id="tablestatistics">'; if (empty($showtable)) { $showtable = PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], null, true); } @@ -924,7 +925,7 @@ if ($cfg['ShowStats']) { </tbody> </table> -  +  </div> <?php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1974-g468238b
by Marc Delisle 24 May '11

24 May '11

The branch, master has been updated via 468238bd0801f4d8b7a7fdeb435debecca89a985 (commit) from 1835d93534d7e82b10c4e08805204b5d10459e63 (commit) - Log ----------------------------------------------------------------- commit 468238bd0801f4d8b7a7fdeb435debecca89a985 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue May 24 10:35:04 2011 -0400 bug #3306958 [interface] Unnecessary Details slider ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_structure.php | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63fbbea..3935ec6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ - bug #3305883 [interface] Table is dropped regardless of confirmation - [auth] Fixed error handling for signon auth method. - bug #3276001 [core] Avoid caching of index.php. +- bug #3306958 [interface] Unnecessary Details slider 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/tbl_structure.php b/tbl_structure.php index 9878b9e..febfbf4 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -700,8 +700,6 @@ if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' != $tbl_type) { <?php } -PMA_generate_slider_effect('tablestatistics', __('Details...')); - /** * Displays Space usage and row statistics */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-38-g24a7764
by Marc Delisle 24 May '11

24 May '11

The branch, QA_3_4 has been updated via 24a77645339b9cb32c524456a10dcd0272fdb926 (commit) from c76187732bea3c95c6beab20229c9584803396f4 (commit) - Log ----------------------------------------------------------------- commit 24a77645339b9cb32c524456a10dcd0272fdb926 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue May 24 10:35:04 2011 -0400 bug #3306958 [interface] Unnecessary Details slider ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_structure.php | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07a810a..c7dd43f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ - bug #3305883 [interface] Table is dropped regardless of confirmation - [auth] Fixed error handling for signon auth method. - bug #3276001 [core] Avoid caching of index.php. +- bug #3306958 [interface] Unnecessary Details slider 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/tbl_structure.php b/tbl_structure.php index 99ec0e9..bb4cc06 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -700,8 +700,6 @@ if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' != $tbl_type) { <?php } -PMA_generate_slider_effect('tablestatistics', __('Details...')); - /** * Displays Space usage and row statistics */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 2288a005cce79eaa795e6b5782145e60999f010f
by Michal Čihař 24 May '11

24 May '11

The branch, master has been updated via 2288a005cce79eaa795e6b5782145e60999f010f (commit) via d9e6e1f5e5199f36e6a09d4955bf7a6bd1cfb4df (commit) via dba8d9610b4af1cf7647feae71aa9f7d7b0f313f (commit) from e44eb2866f5210b701416b82c29af918841ec666 (commit) - Log ----------------------------------------------------------------- commit 2288a005cce79eaa795e6b5782145e60999f010f Author: Michal Čihař <mcihar(a)novell.com> Date: Tue May 24 16:21:13 2011 +0200 Add CVE ids commit d9e6e1f5e5199f36e6a09d4955bf7a6bd1cfb4df Merge: dba8d9610b4af1cf7647feae71aa9f7d7b0f313f e44eb2866f5210b701416b82c29af918841ec666 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue May 24 16:20:29 2011 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/website commit dba8d9610b4af1cf7647feae71aa9f7d7b0f313f Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 16 16:07:54 2011 +0200 Do not point to (disabled) cia.vc ----------------------------------------------------------------------- Summary of changes: render.py | 2 +- templates/security/PMASA-2011-3 | 2 +- templates/security/PMASA-2011-4 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/render.py b/render.py index 9cb655b..a28b47a 100755 --- a/render.py +++ b/render.py @@ -85,7 +85,7 @@ PROJECT_FILES_RSS = 'https://sourceforge.net/api/file/index/project-id/%d/rss' % PROJECT_NEWS_RSS = 'https://sourceforge.net/export/rss2_projnews.php?group_id=%d&rss_fulltext=1…' % PROJECT_ID PROJECT_SUMMARY_RSS = 'https://sourceforge.net/export/rss2_projsummary.php?group_id=%d' % PROJECT_ID DONATIONS_RSS = 'https://sourceforge.net/export/rss2_projdonors.php?group_id=%d&limit=20' % PROJECT_ID -PROJECT_VCS_RSS = 'http://cia.vc/stats/project/phpmyadmin/.rss' +PROJECT_VCS_RSS = 'http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/phpmyadmi…' PROJECT_DL = 'http://prdownloads.sourceforge.net/%s/%%s' % PROJECT_NAME PROJECT_GIT = 'git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin' PLANET_RSS = 'http://planet.phpmyadmin.net/rss20.xml' diff --git a/templates/security/PMASA-2011-3 b/templates/security/PMASA-2011-3 index cb973dd..215554e 100644 --- a/templates/security/PMASA-2011-3 +++ b/templates/security/PMASA-2011-3 @@ -42,7 +42,7 @@ This issue was found by a person who wishes to be known as "dave b". </py:def>  -<py:def function="announcement_cve">CVE-2011-XXXX</py:def> +<py:def function="announcement_cve">CVE-2011-1940</py:def> <py:def function="announcement_cwe">661 79</py:def> diff --git a/templates/security/PMASA-2011-4 b/templates/security/PMASA-2011-4 index 1ebbfda..7909027 100644 --- a/templates/security/PMASA-2011-4 +++ b/templates/security/PMASA-2011-4 @@ -37,7 +37,7 @@ This issue was found by Kian Mohageri. </py:def>  -<py:def function="announcement_cve">CVE-2011-XXXX</py:def> +<py:def function="announcement_cve">CVE-2011-1941</py:def> <py:def function="announcement_cwe">661 601</py:def> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1973-g1835d93
by Piotr Przybylski 24 May '11

24 May '11

The branch, master has been updated via 1835d93534d7e82b10c4e08805204b5d10459e63 (commit) from 9f5fad2697564642aa88f3652f08d75cb3ac0b04 (commit) - Log ----------------------------------------------------------------- commit 1835d93534d7e82b10c4e08805204b5d10459e63 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue May 24 15:03:17 2011 +0200 Indentation fixes ----------------------------------------------------------------------- Summary of changes: server_databases.php | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server_databases.php b/server_databases.php index a4fbf89..365055a 100644 --- a/server_databases.php +++ b/server_databases.php @@ -263,13 +263,13 @@ if ($databases_count > 0) { } if (empty($dbstats)) { - echo '<ul><li id="li_switch_dbstats"><strong>' . "\n"; - echo ' <a href="./server_databases.php?' . $url_query . '&dbstats=1"' - .' title="' . __('Enable Statistics') . '">' . "\n" - .' ' . __('Enable Statistics'); - echo '</a></strong><br />' . "\n"; - PMA_Message::notice(__('Note: Enabling the database statistics here might cause heavy traffic between the web server and the MySQL server.'))->display(); - echo '</li>' . "\n" . '</ul>' . "\n"; + echo '<ul><li id="li_switch_dbstats"><strong>' . "\n"; + echo ' <a href="./server_databases.php?' . $url_query . '&dbstats=1"' + .' title="' . __('Enable Statistics') . '">' . "\n" + .' ' . __('Enable Statistics'); + echo '</a></strong><br />' . "\n"; + PMA_Message::notice(__('Note: Enabling the database statistics here might cause heavy traffic between the web server and the MySQL server.'))->display(); + echo '</li>' . "\n" . '</ul>' . "\n"; } echo '</form>'; echo '</div>'; 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