Git October 2011

git@phpmyadmin.net

6 participants
164 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20716-gf06ab07
by Marc Delisle 03 Oct '11

03 Oct '11

The branch, master has been updated via f06ab07979c5ca084955759a62092d51d90e1489 (commit) via 7d586b458dbbaf4002ead84ef7edea60833c528c (commit) via fbaa5cc1a1cd4fbbb8588cda958c803b186eb064 (commit) via e05b37d3c9e5b99e8a779fe55780d92df17b4a55 (commit) via 46a1afb372782533d8b04d72ae4b9b13a1248c0a (commit) from d35cba980893aa6e6455fd6e6f14f3e3f1204c52 (commit) - Log ----------------------------------------------------------------- commit f06ab07979c5ca084955759a62092d51d90e1489 Merge: d35cba9 7d586b4 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 3 15:12:44 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-41-g7d586b4
by Marc Delisle 03 Oct '11

03 Oct '11

The branch, QA_3_4 has been updated via 7d586b458dbbaf4002ead84ef7edea60833c528c (commit) via e05b37d3c9e5b99e8a779fe55780d92df17b4a55 (commit) via 46a1afb372782533d8b04d72ae4b9b13a1248c0a (commit) from fbaa5cc1a1cd4fbbb8588cda958c803b186eb064 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20711-gd35cba9
by Dieter Adriaenssens 03 Oct '11

03 Oct '11

The branch, master has been updated via d35cba980893aa6e6455fd6e6f14f3e3f1204c52 (commit) from 2ff7b4cc93eb88325b2ac2930b966208642c1111 (commit) - Log ----------------------------------------------------------------- commit d35cba980893aa6e6455fd6e6f14f3e3f1204c52 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Mon Oct 3 20:38:36 2011 +0200 Fixed local path disclosure vulnerability, see PMASA-2011-15 ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + phpmyadmin.css.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9248689..270b514 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,7 @@ phpMyAdmin - ChangeLog - bug #3414744 [core] External link fails in 3.4.5 - patch #3314626 [display] CharTextareaRows is not respected - bug #3417089 [synchronize] Extraneous db choices +- [security] Fixed local path disclosure vulnerability, see PMASA-2011-15 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php index 2275c97..b3cfecc 100644 --- a/phpmyadmin.css.php +++ b/phpmyadmin.css.php @@ -9,7 +9,7 @@ * */ // sometimes, we lose $_REQUEST['js_frame'] -define('PMA_FRAME', empty($_REQUEST['js_frame']) ? 'right' : $_REQUEST['js_frame']); +define('PMA_FRAME', (! empty($_REQUEST['js_frame']) && is_string($_REQUEST['js_frame'])) ? $_REQUEST['js_frame'] : 'right'); define('PMA_MINIMUM_COMMON', true); require_once './libraries/common.inc.php'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-38-gfbaa5cc
by Dieter Adriaenssens 03 Oct '11

03 Oct '11

The branch, QA_3_4 has been updated via fbaa5cc1a1cd4fbbb8588cda958c803b186eb064 (commit) from b939d1048ec3bebf066bcccafbcd3d2998db3521 (commit) - Log ----------------------------------------------------------------- commit fbaa5cc1a1cd4fbbb8588cda958c803b186eb064 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Mon Oct 3 20:38:36 2011 +0200 Fixed local path disclosure vulnerability, see PMASA-2011-15 ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + phpmyadmin.css.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f4daa4..f36cc67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog - bug #3414744 [core] External link fails in 3.4.5 - patch #3314626 [display] CharTextareaRows is not respected - bug #3417089 [synchronize] Extraneous db choices +- [security] Fixed local path disclosure vulnerability, see PMASA-2011-15 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php index 2275c97..b3cfecc 100644 --- a/phpmyadmin.css.php +++ b/phpmyadmin.css.php @@ -9,7 +9,7 @@ * */ // sometimes, we lose $_REQUEST['js_frame'] -define('PMA_FRAME', empty($_REQUEST['js_frame']) ? 'right' : $_REQUEST['js_frame']); +define('PMA_FRAME', (! empty($_REQUEST['js_frame']) && is_string($_REQUEST['js_frame'])) ? $_REQUEST['js_frame'] : 'right'); define('PMA_MINIMUM_COMMON', true); require_once './libraries/common.inc.php'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_6, updated. RELEASE_3_4_5-38-ge05b37d
by Dieter Adriaenssens 03 Oct '11

03 Oct '11

The branch, MAINT_3_4_6 has been updated via e05b37d3c9e5b99e8a779fe55780d92df17b4a55 (commit) from 46a1afb372782533d8b04d72ae4b9b13a1248c0a (commit) - Log ----------------------------------------------------------------- commit e05b37d3c9e5b99e8a779fe55780d92df17b4a55 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Mon Oct 3 20:38:36 2011 +0200 Fixed local path disclosure vulnerability, see PMASA-2011-15 ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + phpmyadmin.css.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 239796f..b8c33cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog - bug #3414744 [core] External link fails in 3.4.5 - patch #3314626 [display] CharTextareaRows is not respected - bug #3417089 [synchronize] Extraneous db choices +- [security] Fixed local path disclosure vulnerability, see PMASA-2011-15 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php index 2275c97..b3cfecc 100644 --- a/phpmyadmin.css.php +++ b/phpmyadmin.css.php @@ -9,7 +9,7 @@ * */ // sometimes, we lose $_REQUEST['js_frame'] -define('PMA_FRAME', empty($_REQUEST['js_frame']) ? 'right' : $_REQUEST['js_frame']); +define('PMA_FRAME', (! empty($_REQUEST['js_frame']) && is_string($_REQUEST['js_frame'])) ? $_REQUEST['js_frame'] : 'right'); define('PMA_MINIMUM_COMMON', true); require_once './libraries/common.inc.php'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin themes branch, master, updated. toba-0.2-4-gbe74956
by Madhura Jayaratne 03 Oct '11

03 Oct '11

The branch, master has been updated via be7495687257c1ca32c9d61d7d6c639e802eee10 (commit) via 5b294faa392394154ccfd2857ff83d489452f0c4 (commit) from 28657274bb6992de79aa809325f3637bd78b9877 (commit) - Log ----------------------------------------------------------------- commit be7495687257c1ca32c9d61d7d6c639e802eee10 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon Oct 3 23:11:20 2011 +0530 styles related to inline_edit for 3.4 compatible themes commit 5b294faa392394154ccfd2857ff83d489452f0c4 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon Oct 3 23:03:40 2011 +0530 b_save icon for 3.4 compatible themes ----------------------------------------------------------------------- Summary of changes: darkblue_orange/img/b_save.png | Bin 0 -> 751 bytes graphite/css/theme_right.css.php | 7 +++++++ graphite/img/b_save.png | Bin 0 -> 743 bytes toba/css/theme_right.css.php | 7 +++++++ 4 files changed, 14 insertions(+), 0 deletions(-) create mode 100644 darkblue_orange/img/b_save.png create mode 100644 graphite/img/b_save.png diff --git a/darkblue_orange/img/b_save.png b/darkblue_orange/img/b_save.png new file mode 100644 index 0000000..0a801ce Binary files /dev/null and b/darkblue_orange/img/b_save.png differ diff --git a/graphite/css/theme_right.css.php b/graphite/css/theme_right.css.php index c111178..9cecfed 100644 --- a/graphite/css/theme_right.css.php +++ b/graphite/css/theme_right.css.php @@ -177,6 +177,13 @@ fieldset.tblFooters { border-radius: 0 0 0.5em 0.5em; } +div.null_div { + height: 20px; + text-align: center; + font-style:normal; + min-width:60px; +} + fieldset .formelement { float: <?php echo $left; ?>; margin-<?php echo $right; ?>: 0.5em; diff --git a/graphite/img/b_save.png b/graphite/img/b_save.png new file mode 100644 index 0000000..3dd8b6b Binary files /dev/null and b/graphite/img/b_save.png differ diff --git a/toba/css/theme_right.css.php b/toba/css/theme_right.css.php index 7825011..3fdf76d 100644 --- a/toba/css/theme_right.css.php +++ b/toba/css/theme_right.css.php @@ -165,6 +165,13 @@ fieldset.tblFooters { clear: both; } +div.null_div { + height: 20px; + text-align: center; + font-style:normal; + min-width:60px; +} + fieldset .formelement { float: <?php echo $left; ?>; margin-<?php echo $right; ?>: 0.5em; hooks/post-receive -- phpMyAdmin themes

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20710-g2ff7b4c
by Marc Delisle 03 Oct '11

03 Oct '11

The branch, master has been updated via 2ff7b4cc93eb88325b2ac2930b966208642c1111 (commit) via 0baec64a647642ca21e110b40e21b9dfabfdd32b (commit) via b939d1048ec3bebf066bcccafbcd3d2998db3521 (commit) from a1da3096a19c78db7e34125f6e0966654bcb4aa0 (commit) - Log ----------------------------------------------------------------- commit 2ff7b4cc93eb88325b2ac2930b966208642c1111 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 3 12:42:35 2011 -0400 Fix merge conflicts commit 0baec64a647642ca21e110b40e21b9dfabfdd32b Merge: a1da309 b939d10 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 3 12:41:32 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 016cbaf..9248689 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,8 @@ phpMyAdmin - ChangeLog + Support Drizzle database - bug #3356456 [interface] Interface problems for queries having LIMIT clauses +3.4.7.0 (not yet released) + 3.4.6.0 (not yet released) - patch #3404173 InnoDB comment display with tooltips/aliases - bug #3404886 [navi] Edit SQL statement after error hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-37-gb939d10
by Marc Delisle 03 Oct '11

03 Oct '11

The branch, QA_3_4 has been updated via b939d1048ec3bebf066bcccafbcd3d2998db3521 (commit) from e27961b1b282677a541f42db17e615525caaf30d (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 239796f..9f4daa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +3.4.7.0 (not yet released) + 3.4.6.0 (not yet released) - patch #3404173 InnoDB comment display with tooltips/aliases - bug #3404886 [navi] Edit SQL statement after error diff --git a/Documentation.html b/Documentation.html index dd5c999..2938a3b 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.6-dev - Documentation</title> + <title>phpMyAdmin 3.4.7-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.6-dev + 3.4.7-dev Documentation </h1> </div> diff --git a/README b/README index 4c82229..caec19f 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.6-dev +Version 3.4.7-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 4cc2315..a6f4e12 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.6-dev'); + $this->set('PMA_VERSION', '3.4.7-dev'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_6, updated. RELEASE_3_4_5-37-g46a1afb
by Marc Delisle 03 Oct '11

03 Oct '11

The branch, MAINT_3_4_6 has been updated via 46a1afb372782533d8b04d72ae4b9b13a1248c0a (commit) from e27961b1b282677a541f42db17e615525caaf30d (commit) - Log ----------------------------------------------------------------- commit 46a1afb372782533d8b04d72ae4b9b13a1248c0a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 3 12:34:18 2011 -0400 Preparing for 3.4.6-rc1 ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index dd5c999..645f86e 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.6-dev - Documentation</title> + <title>phpMyAdmin 3.4.6-rc1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.6-dev + 3.4.6-rc1 Documentation </h1> </div> diff --git a/README b/README index 4c82229..e94403e 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.6-dev +Version 3.4.6-rc1 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 4cc2315..77da8dd 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.6-dev'); + $this->set('PMA_VERSION', '3.4.6-rc1'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_6, created. RELEASE_3_4_5-36-ge27961b
by Marc Delisle 03 Oct '11

03 Oct '11

The branch, MAINT_3_4_6 has been created at e27961b1b282677a541f42db17e615525caaf30d (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git October 2011