- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18361-ge2864a3
by Marc Delisle 04 Sep '11

04 Sep '11

The branch, master has been updated via e2864a383efd0b2c18c7c0967e315f07ccf5cf96 (commit) via 2694b3dae0e8c8feeb0c67f0c7606c351443fe42 (commit) via 1b5461dc75db35efdb69e8a7fbdccb6a6e8e9e34 (commit) via 15f887a979a1a6323b9a7d50f0462c63f489e954 (commit) from 2dba1449bdeb6ebf52ee2b2a52cf3ce914e21c1a (commit) - Log ----------------------------------------------------------------- commit e2864a383efd0b2c18c7c0967e315f07ccf5cf96 Merge: 2dba144 2694b3d Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Sep 4 08:27:20 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Documentation.html b/Documentation.html index 35863f5..e4e8bca 100644 --- a/Documentation.html +++ b/Documentation.html @@ -2262,6 +2262,10 @@ setfacl -d -m "g:www-data:rwx" tmp that users can't set through user preferences. For possible values, refer to <tt>libraries/config/user_preferences.forms.php</tt>.</dd> + <dt id="cfg_UserprefsDeveloperTab">$cfg['UserprefsDeveloperTab'] boolean</dt> + <dd>Activates in the user preferences a tab containing options for + developers of phpMyAdmin.</dd> + <dt id="cfg_TitleTable">$cfg['TitleTable'] string</dt> <dt id="cfg_TitleDatabase">$cfg['TitleDatabase'] string</dt> <dt id="cfg_TitleServer">$cfg['TitleServer'] string</dt> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_4-36-g2694b3d
by Marc Delisle 04 Sep '11

04 Sep '11

The branch, QA_3_4 has been updated via 2694b3dae0e8c8feeb0c67f0c7606c351443fe42 (commit) from 1b5461dc75db35efdb69e8a7fbdccb6a6e8e9e34 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Documentation.html b/Documentation.html index 844dd7d..1217c2d 100644 --- a/Documentation.html +++ b/Documentation.html @@ -2163,6 +2163,10 @@ setfacl -d -m "g:www-data:rwx" tmp that users can't set through user preferences. For possible values, refer to <tt>libraries/config/user_preferences.forms.php</tt>.</dd> + <dt id="cfg_UserprefsDeveloperTab">$cfg['UserprefsDeveloperTab'] boolean</dt> + <dd>Activates in the user preferences a tab containing options for + developers of phpMyAdmin.</dd> + <dt id="cfg_TitleTable">$cfg['TitleTable'] string</dt> <dt id="cfg_TitleDatabase">$cfg['TitleDatabase'] string</dt> <dt id="cfg_TitleServer">$cfg['TitleServer'] string</dt> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18357-g2dba144
by Marc Delisle 02 Sep '11

02 Sep '11

The branch, master has been updated via 2dba1449bdeb6ebf52ee2b2a52cf3ce914e21c1a (commit) from 77e5cc3e8a6082dbc300080fedc14b581df59f4d (commit) - Log ----------------------------------------------------------------- commit 2dba1449bdeb6ebf52ee2b2a52cf3ce914e21c1a Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Sep 2 12:44:02 2011 -0400 3.4.6-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 758b297..6020d7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,8 @@ phpMyAdmin - ChangeLog + [interface] 'Function based search' for GIS data + Support Drizzle database +3.4.6.0 (not yet released) + 3.4.5.0 (not yet released) - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_4-35-g1b5461d
by Marc Delisle 02 Sep '11

02 Sep '11

The branch, QA_3_4 has been updated via 1b5461dc75db35efdb69e8a7fbdccb6a6e8e9e34 (commit) from 15f887a979a1a6323b9a7d50f0462c63f489e954 (commit) - Log ----------------------------------------------------------------- commit 1b5461dc75db35efdb69e8a7fbdccb6a6e8e9e34 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Sep 2 12:42:55 2011 -0400 3.4.6-dev ----------------------------------------------------------------------- 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 20e1751..167760d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +3.4.6.0 (not yet released) + 3.4.5.0 (not yet released) - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced diff --git a/Documentation.html b/Documentation.html index 1e11f8d..844dd7d 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.5-dev - Documentation</title> + <title>phpMyAdmin 3.4.6-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.5-dev + 3.4.6-dev Documentation </h1> </div> diff --git a/README b/README index 9c627c5..4c82229 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.5-dev +Version 3.4.6-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 f76d545..4cc2315 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.5-dev'); + $this->set('PMA_VERSION', '3.4.6-dev'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_5, updated. RELEASE_3_4_4-35-g4039683
by Marc Delisle 02 Sep '11

02 Sep '11

The branch, MAINT_3_4_5 has been updated via 4039683ab3ca63c979948e02345b6d38452f8dee (commit) from 15f887a979a1a6323b9a7d50f0462c63f489e954 (commit) - Log ----------------------------------------------------------------- commit 4039683ab3ca63c979948e02345b6d38452f8dee Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Sep 2 12:40:33 2011 -0400 Preparing 3.4.5-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 1e11f8d..019939e 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.5-dev - Documentation</title> + <title>phpMyAdmin 3.4.5-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.5-dev + 3.4.5-rc1 Documentation </h1> </div> diff --git a/README b/README index 9c627c5..a836068 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.5-dev +Version 3.4.5-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 f76d545..96fd61d 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.5-dev'); + $this->set('PMA_VERSION', '3.4.5-rc1'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_5, created. RELEASE_3_4_4-34-g15f887a
by Marc Delisle 02 Sep '11

02 Sep '11

The branch, MAINT_3_4_5 has been created at 15f887a979a1a6323b9a7d50f0462c63f489e954 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18356-g77e5cc3
by Piotr Przybylski 02 Sep '11

02 Sep '11

The branch, master has been updated via 77e5cc3e8a6082dbc300080fedc14b581df59f4d (commit) from 9611e049c331fd6caa03e2b481b527bd9f7c22af (commit) - Log ----------------------------------------------------------------- commit 77e5cc3e8a6082dbc300080fedc14b581df59f4d Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Sep 2 17:02:21 2011 +0200 Changed slider to use fixed-size 'blind' animation instead of 'slide' ----------------------------------------------------------------------- Summary of changes: js/functions.js | 46 +++++++++++++++++++++++++++++----------------- 1 files changed, 29 insertions(+), 17 deletions(-) diff --git a/js/functions.js b/js/functions.js index cae7ed4..c63a3d0 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2774,13 +2774,12 @@ function PMA_getRowNumber(classlist) /** * Changes status of slider */ -function PMA_set_status_label(id) +function PMA_set_status_label($element) { - if ($('#' + id).css('display') == 'none') { - $('#anchor_status_' + id).text('+ '); - } else { - $('#anchor_status_' + id).text('- '); - } + var text = $element.css('display') == 'none' + ? '+ ' + : '- '; + $element.closest('.slide-wrapper').prev().find('span').text(text); } /** @@ -2788,21 +2787,34 @@ function PMA_set_status_label(id) */ function PMA_init_slider() { - $('.pma_auto_slider').each(function(idx, e) { - if ($(e).hasClass('slider_init_done')) return; - $(e).addClass('slider_init_done'); - $('<span id="anchor_status_' + e.id + '"></span>') - .insertBefore(e); - PMA_set_status_label(e.id); - - $('<a href="#' + e.id + '" id="anchor_' + e.id + '">' + e.title + '</a>') - .insertBefore(e) + $('.pma_auto_slider').each(function() { + var $this = $(this); + + if ($this.hasClass('slider_init_done')) { + return; + } + $this.addClass('slider_init_done'); + + var $wrapper = $('<div>', {'class': 'slide-wrapper'}).css('height', $this.outerHeight(true)); + $wrapper.toggle($this.is(':visible')); + $('<a>', {href: '#'+this.id}) + .text(this.title) + .prepend($('<span>')) + .insertBefore($this) .click(function() { - $('#' + e.id).toggle('clip', function() { - PMA_set_status_label(e.id); + var $wrapper = $this.closest('.slide-wrapper'); + var visible = $this.is(':visible'); + if (!visible) { + $wrapper.show(); + } + $this[visible ? 'hide' : 'show']('blind', function() { + $wrapper.toggle(!visible); + PMA_set_status_label($this); }); return false; }); + $this.wrap($wrapper); + PMA_set_status_label($this); }); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18355-g9611e04
by Dieter Adriaenssens 02 Sep '11

02 Sep '11

The branch, master has been updated via 9611e049c331fd6caa03e2b481b527bd9f7c22af (commit) from f4f3d46989cc18f1ccfbca193788bd4de0018305 (commit) - Log ----------------------------------------------------------------- commit 9611e049c331fd6caa03e2b481b527bd9f7c22af Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Fri Sep 2 15:48:15 2011 +0200 typos ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index c346111..37103f9 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1063,7 +1063,7 @@ function PMA_DBI_get_columns($database, $table, $column = null, $full = false, $ } /** -* Returns SQL for fetching informatin on table indexes (SHOW INDEXES) +* Returns SQL for fetching information on table indexes (SHOW INDEXES) * * @param string $database name of database * @param string $table name of the table whose indexes are to be retreived @@ -1104,10 +1104,10 @@ function PMA_DBI_get_table_indexes_sql($database, $table, $where = null) } /** -* Returns indexes od a table +* Returns indexes of a table * * @param string $database name of database -* @param string $table name of the table whose indexes are to be retreived +* @param string $table name of the table whose indexes are to be retrieved * @param mixed $link mysql link resource * @return array $indexes */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18354-gf4f3d46
by Piotr Przybylski 02 Sep '11

02 Sep '11

The branch, master has been updated via f4f3d46989cc18f1ccfbca193788bd4de0018305 (commit) from f6da9031f9ac6545c87422cb6dd5fd271be6419d (commit) - Log ----------------------------------------------------------------- commit f4f3d46989cc18f1ccfbca193788bd4de0018305 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Sep 2 15:21:18 2011 +0200 length is unknown for geometry fields, make enough space to edit very simple WKTs (text fields were 4 characters wide) ----------------------------------------------------------------------- Summary of changes: tbl_change.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tbl_change.php b/tbl_change.php index 6024d80..5395dda 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -458,6 +458,10 @@ foreach ($rows as $row_id => $vrow) { if (-1 === $field['len']) { $field['len'] = PMA_DBI_field_len($vresult, $i); + // length is unknown for geometry fields, make enough space to edit very simple WKTs + if (-1 === $field['len']) { + $field['len'] = 30; + } } //Call validation when the form submited... $unnullify_trigger = $chg_evt_handler . "=\"return verificationsAfterFieldChange('". PMA_escapeJsString($field['Field_md5']) . "', '" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18353-gf6da903
by Michal Čihař 01 Sep '11

01 Sep '11

The branch, master has been updated via f6da9031f9ac6545c87422cb6dd5fd271be6419d (commit) via dc6b7e7b68eb4ed5ad9a8d4aa5b6a4d24f221b9f (commit) via 30a3d9610233f3ea179781e18edb52e372d6fcdd (commit) via 1aee51de7dd73c6781b2fbacd3db936ae8c68218 (commit) from a2093e66e2189756057f152223b64aee8b495d71 (commit) - Log ----------------------------------------------------------------- commit f6da9031f9ac6545c87422cb6dd5fd271be6419d Merge: a2093e6 dc6b7e7 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Sep 1 14:45:43 2011 +0200 Merge remote-tracking branch 'pootle/master' commit dc6b7e7b68eb4ed5ad9a8d4aa5b6a4d24f221b9f Merge: 30a3d96 1b8b7a9 Author: Pootle server <pootle(a)cihar.com> Date: Thu Sep 1 14:40:25 2011 +0200 Merge remote-tracking branch 'origin/master' commit 30a3d9610233f3ea179781e18edb52e372d6fcdd Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Sep 1 11:59:42 2011 +0200 Translation update done using Pootle. commit 1aee51de7dd73c6781b2fbacd3db936ae8c68218 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Sep 1 11:54:10 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index 2c43ee1..aaf5ead 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-31 10:47+0200\n" -"PO-Revision-Date: 2011-08-26 15:17+0200\n" +"PO-Revision-Date: 2011-09-01 11:59+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -2200,10 +2200,10 @@ msgid "Remove \"./config\" directory before using phpMyAdmin!" msgstr "phpMyAdmin'den önce kullanılan \"./config\" dizinini kaldır!" #: libraries/Config.class.php:727 -#, fuzzy, php-format +#, php-format #| msgid "Existing configuration file (%d) is not readable." msgid "Existing configuration file (%s) is not readable." -msgstr "Mevcut yapılandırma dosyası (%d) okunabilir değil." +msgstr "Mevcut yapılandırma dosyası (%s) okunabilir değil." #: libraries/Config.class.php:752 msgid "Wrong permissions on configuration file, should not be world writable!" @@ -2427,6 +2427,9 @@ msgid "" "after you refresh this page. Please check if the table structure has been " "changed." msgstr "" +"KA özelliği \"%s\" kaydedilemiyor. Yapılan değişiklikler bu sayfayı " +"yenilemenizden sonra kalıcı olmayacaktır. Eğer tablo yapısı değiştirilmişse " +"lütfen kontrol edin." #: libraries/Theme.class.php:145 #, php-format hooks/post-receive -- phpMyAdmin

1 0