Git

git@phpmyadmin.net

17 participants
38267 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0RC2-1003-gf56619e
by Marc Delisle 10 May '11

10 May '11

The branch, QA_3_4 has been updated via f56619e48251f1745d3f6bc51711fa789822a836 (commit) from 5cda32da092764f38346f984fe28a5b9142365fe (commit) - Log ----------------------------------------------------------------- commit f56619e48251f1745d3f6bc51711fa789822a836 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue May 10 05:57:10 2011 -0400 Use correct icon for database in serverinfo div ----------------------------------------------------------------------- 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 807ec0a..a23d2fa 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -123,7 +123,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { PMA_generate_common_url($GLOBALS['db']), htmlspecialchars($GLOBALS['db']), __('Database'), - 's_tbl.png'); + 's_db.png'); // if the table is being dropped, $_REQUEST['purge'] is set // (it always contains "1") // so do not display the table name in upper div hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0RC2-995-g553d2b8
by Marc Delisle 10 May '11

10 May '11

The branch, MAINT_3_4_0 has been updated via 553d2b89a5b9f26ffe4ce4f1a85c30f6fd0194fd (commit) from abbd8b5a3f36edd2c77e7bd6f1ce0b23876cc5be (commit) - Log ----------------------------------------------------------------- commit 553d2b89a5b9f26ffe4ce4f1a85c30f6fd0194fd Author: Marc Delisle <marc(a)infomarc.info> Date: Tue May 10 05:57:10 2011 -0400 Use correct icon for database in serverinfo div ----------------------------------------------------------------------- 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 807ec0a..a23d2fa 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -123,7 +123,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { PMA_generate_common_url($GLOBALS['db']), htmlspecialchars($GLOBALS['db']), __('Database'), - 's_tbl.png'); + 's_db.png'); // if the table is being dropped, $_REQUEST['purge'] is set // (it always contains "1") // so do not display the table name in upper div hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-1067-g4a4c7b8
by Michal Čihař 10 May '11

10 May '11

The branch, master has been updated via 4a4c7b84276dc983912fa8ec39af243238658deb (commit) via 5cda32da092764f38346f984fe28a5b9142365fe (commit) via abbd8b5a3f36edd2c77e7bd6f1ce0b23876cc5be (commit) via 5e82c3634d2ac3f6ff46341d091342ae7c0f070a (commit) via 393f4772e11c2cc62028570a8ea2c4f0c3ccdc28 (commit) via a604d2152904f663ad1061d4e759e893878c82fc (commit) via 485fb634cae6c23280face51ce2891dd2dbd0795 (commit) from 69c1e15473447eff3ea337eb75b6dc2432b06189 (commit) - Log ----------------------------------------------------------------- commit 4a4c7b84276dc983912fa8ec39af243238658deb Merge: 69c1e15473447eff3ea337eb75b6dc2432b06189 5cda32da092764f38346f984fe28a5b9142365fe Author: Michal Čihař <mcihar(a)novell.com> Date: Tue May 10 11:24:37 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: libraries/Error.class.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/Error.class.php b/libraries/Error.class.php index c499d8d..2cfd5fe 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -47,15 +47,15 @@ class PMA_Error extends PMA_Message */ static public $errorlevel = array ( E_ERROR => 'error', - E_WARNING => 'warning', + E_WARNING => 'error', E_PARSE => 'error', E_NOTICE => 'notice', E_CORE_ERROR => 'error', - E_CORE_WARNING => 'warning', + E_CORE_WARNING => 'error', E_COMPILE_ERROR => 'error', - E_COMPILE_WARNING => 'warning', + E_COMPILE_WARNING => 'error', E_USER_ERROR => 'error', - E_USER_WARNING => 'warning', + E_USER_WARNING => 'error', E_USER_NOTICE => 'notice', E_STRICT => 'notice', E_DEPRECATED => 'notice', hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0RC2-1002-g5cda32d
by Michal Čihař 10 May '11

10 May '11

The branch, QA_3_4 has been updated via 5cda32da092764f38346f984fe28a5b9142365fe (commit) via abbd8b5a3f36edd2c77e7bd6f1ce0b23876cc5be (commit) via 5e82c3634d2ac3f6ff46341d091342ae7c0f070a (commit) via 393f4772e11c2cc62028570a8ea2c4f0c3ccdc28 (commit) from a604d2152904f663ad1061d4e759e893878c82fc (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/Error.class.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/Error.class.php b/libraries/Error.class.php index c499d8d..2cfd5fe 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -47,15 +47,15 @@ class PMA_Error extends PMA_Message */ static public $errorlevel = array ( E_ERROR => 'error', - E_WARNING => 'warning', + E_WARNING => 'error', E_PARSE => 'error', E_NOTICE => 'notice', E_CORE_ERROR => 'error', - E_CORE_WARNING => 'warning', + E_CORE_WARNING => 'error', E_COMPILE_ERROR => 'error', - E_COMPILE_WARNING => 'warning', + E_COMPILE_WARNING => 'error', E_USER_ERROR => 'error', - E_USER_WARNING => 'warning', + E_USER_WARNING => 'error', E_USER_NOTICE => 'notice', E_STRICT => 'notice', E_DEPRECATED => 'notice', hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0RC2-994-gabbd8b5
by Michal Čihař 10 May '11

10 May '11

The branch, MAINT_3_4_0 has been updated via abbd8b5a3f36edd2c77e7bd6f1ce0b23876cc5be (commit) from 5e82c3634d2ac3f6ff46341d091342ae7c0f070a (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/Error.class.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/Error.class.php b/libraries/Error.class.php index c499d8d..2cfd5fe 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -47,15 +47,15 @@ class PMA_Error extends PMA_Message */ static public $errorlevel = array ( E_ERROR => 'error', - E_WARNING => 'warning', + E_WARNING => 'error', E_PARSE => 'error', E_NOTICE => 'notice', E_CORE_ERROR => 'error', - E_CORE_WARNING => 'warning', + E_CORE_WARNING => 'error', E_COMPILE_ERROR => 'error', - E_COMPILE_WARNING => 'warning', + E_COMPILE_WARNING => 'error', E_USER_ERROR => 'error', - E_USER_WARNING => 'warning', + E_USER_WARNING => 'error', E_USER_NOTICE => 'notice', E_STRICT => 'notice', E_DEPRECATED => 'notice', hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-1060-g69c1e15
by Michal Čihař 09 May '11

09 May '11

The branch, master has been updated via 69c1e15473447eff3ea337eb75b6dc2432b06189 (commit) from 329c5551d4bc8e8a2c7fe378b6d0ed26e6e2ff78 (commit) - Log ----------------------------------------------------------------- commit 69c1e15473447eff3ea337eb75b6dc2432b06189 Author: Michal Čihař <michal(a)cihar.com> Date: Mon May 9 22:37:34 2011 +0200 Fixup merge of translations ----------------------------------------------------------------------- Summary of changes: po/ja.po | 57 --------------------------------------------------------- 1 files changed, 0 insertions(+), 57 deletions(-) diff --git a/po/ja.po b/po/ja.po index 23fc5ef..11eed48 100644 --- a/po/ja.po +++ b/po/ja.po @@ -111,13 +111,7 @@ msgstr "リモート URL を開けませんでした。" msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." -<<<<<<< HEAD msgstr "ファイル %s は、このシステムでは使用できません。詳細については www.phpmyadmin.net をご覧ください。" -======= -msgstr "" -"ファイル %s は、このシステムでは使用できません。詳細については www." -"phpmyadmin.net をご覧ください。" ->>>>>>> QA_3_4 #: db_create.php:58 #, php-format @@ -539,10 +533,6 @@ msgstr "表示" #: db_search.php:259 #, php-format -<<<<<<< HEAD -#| msgid "Dumping data for table" -======= ->>>>>>> QA_3_4 msgid "Delete the matches for the %s table?" msgstr "テーブル %s に対して条件に一致したものを削除しますか？" @@ -5103,13 +5093,7 @@ msgstr "ポート" msgid "" "The port for the PBMS stream-based communications. Setting this value to 0 " "will disable HTTP communication with the daemon." -<<<<<<< HEAD msgstr "PBMS ストリームに基づいた通信用のポートです。この値を 0 に設定すると、デーモンとの HTTP 通信を無効にします。" -======= -msgstr "" -"PBMS ストリームに基づいた通信用のポートです。この値を 0 に設定すると、デーモ" -"ンとの HTTP 通信を無効にします。" ->>>>>>> QA_3_4 #: libraries/engines/pbms.lib.php:40 msgid "Repository Threshold" @@ -5180,18 +5164,9 @@ msgstr "" msgid "" "Documentation and further information about PBMS can be found on %sThe " "PrimeBase Media Streaming home page%s." -<<<<<<< HEAD msgstr "PBMS に関するドキュメントおよび詳細な情報は、%sPrimeBase Media Streaming オフィシャルサイト%sにあります。" #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127 -#| msgid "Relations" -======= -msgstr "" -"PBMS に関するドキュメントおよび詳細な情報は、%sPrimeBase Media Streaming オ" -"フィシャルサイト%sにあります。" - -#: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127 ->>>>>>> QA_3_4 msgid "Related Links" msgstr "関連リンク" @@ -5355,13 +5330,7 @@ msgstr "" msgid "" "Documentation and further information about PBXT can be found on the " "%sPrimeBase XT Home Page%s." -<<<<<<< HEAD msgstr "PBXT に関するドキュメントおよび詳細な情報は、%sPrimeBase XT オフィシャルサイト%sにあります。" -======= -msgstr "" -"PBXT に関するドキュメントおよび詳細な情報は、%sPrimeBase XT オフィシャルサイ" -"ト%sにあります。" ->>>>>>> QA_3_4 #: libraries/engines/pbxt.lib.php:129 msgid "The PrimeBase XT Blog by Paul McCullagh" @@ -7136,10 +7105,6 @@ msgid "Operator" msgstr "演算子" #: pmd_general.php:810 -<<<<<<< HEAD -#| msgid "Table options" -======= ->>>>>>> QA_3_4 msgid "Active options" msgstr "アクティブオプション" @@ -9060,12 +9025,7 @@ msgstr "フォームを表示する" #: setup/lib/index.lib.php:119 msgid "" "Neither URL wrapper nor CURL is available. Version check is not possible." -<<<<<<< HEAD msgstr "URL ラッパ、cURL、いずれも利用できません。バージョンチェックが行えません。" -======= -msgstr "" -"URL ラッパ、cURL、いずれも利用できません。バージョンチェックが行えません。" ->>>>>>> QA_3_4 #: setup/lib/index.lib.php:126 msgid "" @@ -9104,18 +9064,10 @@ msgid "" "proxies list%s. However, IP-based protection may not be reliable if your IP " "belongs to an ISP where thousands of users, including you, are connected to." msgstr "" -<<<<<<< HEAD "この%sオプション%sは無効にするべきです。そうしなければ、いずれかの MySQL " "サーバへのブルートフォース（しらみつぶし）ログインによる攻撃を許すことになります。これが必要と思われる場合には、%s信頼されたプロキシリスト%" "sを使用します。しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接続されている場合には、IP " "アドレスを基にした保護は信頼性が高いとはいえません。" -======= -"この%sオプション%sは無効にするべきです。そうしなければ、いずれかの MySQL サー" -"バへのブルートフォース（しらみつぶし）ログインによる攻撃を許すことになりま" -"す。これが必要と思われる場合には、%s信頼されたプロキシリスト%sを使用します。" -"しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接" -"続されている場合には、IP アドレスを基にした保護は信頼性が高いとはいえません。" ->>>>>>> QA_3_4 #: setup/lib/index.lib.php:252 msgid "" @@ -9439,12 +9391,7 @@ msgstr "" #: tbl_chart.php:166 msgid "" "When drawing a radar chart all values are normalized to a range [0..10]." -<<<<<<< HEAD msgstr "レーダグラフを描画する時は、全ての値が範囲 [0..10] に正規化されています。" -======= -msgstr "" -"レーダグラフを描画する時は、全ての値が範囲 [0..10] に正規化されています。" ->>>>>>> QA_3_4 #: tbl_chart.php:173 msgid "" @@ -9760,10 +9707,6 @@ msgid "An index has been added on %s" msgstr "%s にインデックスを追加しました" #: tbl_structure.php:471 -<<<<<<< HEAD -#| msgid "Show PHP information" -======= ->>>>>>> QA_3_4 msgid "Show more actions" msgstr "他の操作を表示する" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0RC2-993-g5e82c36
by Marc Delisle 09 May '11

09 May '11

The branch, MAINT_3_4_0 has been updated via 5e82c3634d2ac3f6ff46341d091342ae7c0f070a (commit) via 393f4772e11c2cc62028570a8ea2c4f0c3ccdc28 (commit) from ad2caae3ef9a0104b1b0b919b78b5fa4028d2d09 (commit) - Log ----------------------------------------------------------------- commit 5e82c3634d2ac3f6ff46341d091342ae7c0f070a Author: Mike Hommé <mike(a)globalcode.org> Date: Mon May 9 16:01:21 2011 -0400 Fix for 3299241. Updated style for "disabled" topnav buttons. Now easier to read and have a more traditional "disabled" look. commit 393f4772e11c2cc62028570a8ea2c4f0c3ccdc28 Author: Mike Hommé <mike(a)globalcode.org> Date: Thu May 5 20:19:58 2011 -0400 Darkened .notice normal text to better distinguish between hyperlinks ----------------------------------------------------------------------- Summary of changes: themes/pmahomme/css/theme_right.css.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index a2035c3..fc1b36c 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -634,7 +634,7 @@ div.success { } .notice, .footnotes { - color: #3a6c7e; + color: #000; background-color: #e8eef1; } h1.notice, @@ -798,6 +798,8 @@ form.login label { /* topmenu */ #topmenu a {text-shadow:0px 1px 0px #fff;} +#topmenu .error{background:#eee;border:0px !important;color:#aaa;} + ul#topmenu, ul#topmenu2, ul.tabs { font-weight: bold; list-style-type: none; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0RC2-998-ga604d21
by Marc Delisle 09 May '11

09 May '11

The branch, QA_3_4 has been updated via a604d2152904f663ad1061d4e759e893878c82fc (commit) via 485fb634cae6c23280face51ce2891dd2dbd0795 (commit) from 34ed9aa67a65b4333425014d43ccac3ddbccefda (commit) - Log ----------------------------------------------------------------- commit a604d2152904f663ad1061d4e759e893878c82fc Author: Mike Hommé <mike(a)globalcode.org> Date: Mon May 9 16:01:21 2011 -0400 Fix for 3299241. Updated style for "disabled" topnav buttons. Now easier to read and have a more traditional "disabled" look. commit 485fb634cae6c23280face51ce2891dd2dbd0795 Author: Mike Hommé <mike(a)globalcode.org> Date: Thu May 5 20:19:58 2011 -0400 Darkened .notice normal text to better distinguish between hyperlinks ----------------------------------------------------------------------- Summary of changes: themes/pmahomme/css/theme_right.css.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index a2035c3..fc1b36c 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -634,7 +634,7 @@ div.success { } .notice, .footnotes { - color: #3a6c7e; + color: #000; background-color: #e8eef1; } h1.notice, @@ -798,6 +798,8 @@ form.login label { /* topmenu */ #topmenu a {text-shadow:0px 1px 0px #fff;} +#topmenu .error{background:#eee;border:0px !important;color:#aaa;} + ul#topmenu, ul#topmenu2, ul.tabs { font-weight: bold; list-style-type: none; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-1059-g329c555
by Mike Hommé 09 May '11

09 May '11

The branch, master has been updated via 329c5551d4bc8e8a2c7fe378b6d0ed26e6e2ff78 (commit) from 994606bb23a693c9568314b016db582b20f26b1c (commit) - Log ----------------------------------------------------------------- commit 329c5551d4bc8e8a2c7fe378b6d0ed26e6e2ff78 Author: Mike Hommé <mike(a)globalcode.org> Date: Mon May 9 16:01:21 2011 -0400 Fix for 3299241. Updated style for "disabled" topnav buttons. Now easier to read and have a more traditional "disabled" look. ----------------------------------------------------------------------- Summary of changes: themes/pmahomme/css/theme_right.css.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 008810a..fc1b36c 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -798,6 +798,8 @@ form.login label { /* topmenu */ #topmenu a {text-shadow:0px 1px 0px #fff;} +#topmenu .error{background:#eee;border:0px !important;color:#aaa;} + ul#topmenu, ul#topmenu2, ul.tabs { font-weight: bold; list-style-type: none; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-1058-g994606b
by Mike Hommé 09 May '11

09 May '11

The branch, master has been updated via 994606bb23a693c9568314b016db582b20f26b1c (commit) via 0468e0c6fa075c74fefa5c55ebd5bb8ecb0d33c2 (commit) from 8d3ebd746dfbfe4e2ca86121f0448ba7d5187432 (commit) - Log ----------------------------------------------------------------- commit 994606bb23a693c9568314b016db582b20f26b1c Merge: 0468e0c6fa075c74fefa5c55ebd5bb8ecb0d33c2 8d3ebd746dfbfe4e2ca86121f0448ba7d5187432 Author: Mike Hommé <mike(a)globalcode.org> Date: Mon May 9 15:49:51 2011 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 0468e0c6fa075c74fefa5c55ebd5bb8ecb0d33c2 Author: Mike Hommé <mike(a)globalcode.org> Date: Thu May 5 20:19:58 2011 -0400 Darkened .notice normal text to better distinguish between hyperlinks ----------------------------------------------------------------------- Summary of changes: themes/pmahomme/css/theme_right.css.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index a2035c3..008810a 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -634,7 +634,7 @@ div.success { } .notice, .footnotes { - color: #3a6c7e; + color: #000; background-color: #e8eef1; } h1.notice, 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