- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-158-gecd2868
by Marc Delisle 13 May '11

13 May '11

The branch, master has been updated via ecd28686b805e1c5016bc37080e7347418eceece (commit) from 35852be38cdf665544839bbbf5e233d6c95dc4a0 (commit) - Log ----------------------------------------------------------------- commit ecd28686b805e1c5016bc37080e7347418eceece Author: Marc Delisle <marc(a)infomarc.info> Date: Fri May 13 06:37:15 2011 -0400 "up to date" message on main page when current version is up to date ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 6 +++++- js/messages.php | 1 + 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d471e4..543fef2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ 3.5.0.0 (not yet released) + rfe #2021981 [interface] Add support for mass prefix change. ++ "up to date" message on main page when current version is up to date 3.4.1.0 (not yet released) - bug #3301108 [interface] Synchronize and already configured host diff --git a/js/functions.js b/js/functions.js index 769365b..b3fc631 100644 --- a/js/functions.js +++ b/js/functions.js @@ -92,7 +92,7 @@ function parseVersionString (str) { function PMA_current_version() { var current = parseVersionString(pmaversion); var latest = parseVersionString(PMA_latest_version); - $('#li_pma_version').append(PMA_messages['strLatestAvailable'] + ' ' + PMA_latest_version); + var version_information_message = PMA_messages['strLatestAvailable'] + ' ' + PMA_latest_version; if (latest > current) { var message = $.sprintf(PMA_messages['strNewerVersion'], PMA_latest_version, PMA_latest_date); if (Math.floor(latest / 10000) == Math.floor(current / 10000)) { @@ -103,6 +103,10 @@ function PMA_current_version() { } $('#maincontainer').after('<div class="' + klass + '">' + message + '</div>'); } + if (latest == current) { + version_information_message = ' (' + PMA_messages['strUpToDate'] + ')'; + } + $('#li_pma_version').append(version_information_message); } /** diff --git a/js/messages.php b/js/messages.php index d6d35db..e0102b4 100644 --- a/js/messages.php +++ b/js/messages.php @@ -120,6 +120,7 @@ $js_messages['strMore'] = __('More'); $js_messages['strNewerVersion'] = __('A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.'); /* l10n: Latest available phpMyAdmin version */ $js_messages['strLatestAvailable'] = __(', latest stable version:'); +$js_messages['strUpToDate'] = __('up to date'); echo "var PMA_messages = new Array();\n"; foreach ($js_messages as $name => $js_message) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-157-g35852be
by Michal Čihař 13 May '11

13 May '11

The branch, master has been updated via 35852be38cdf665544839bbbf5e233d6c95dc4a0 (commit) via ec519d5d251230b4bfd72cc22b2a2d29b30f3559 (commit) via 43b41e2ed3020edb1c26e821c6ed4f5065dd364c (commit) from 76a93bafdf69ece26e0492fbc903ec264456c6df (commit) - Log ----------------------------------------------------------------- commit 35852be38cdf665544839bbbf5e233d6c95dc4a0 Merge: 76a93bafdf69ece26e0492fbc903ec264456c6df ec519d5d251230b4bfd72cc22b2a2d29b30f3559 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri May 13 11:54:31 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: js/functions.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/functions.js b/js/functions.js index 6cae921..769365b 100644 --- a/js/functions.js +++ b/js/functions.js @@ -90,7 +90,7 @@ function parseVersionString (str) { * Indicates current available version on main page. */ function PMA_current_version() { - var current = parseVersionString('3.4.0'/*pmaversion*/); + var current = parseVersionString(pmaversion); var latest = parseVersionString(PMA_latest_version); $('#li_pma_version').append(PMA_messages['strLatestAvailable'] + ' ' + PMA_latest_version); if (latest > current) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0-24-gec519d5
by Michal Čihař 13 May '11

13 May '11

The branch, QA_3_4 has been updated via ec519d5d251230b4bfd72cc22b2a2d29b30f3559 (commit) via 43b41e2ed3020edb1c26e821c6ed4f5065dd364c (commit) from 584679c854920714516932d9ad11f7055530f464 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: js/functions.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/functions.js b/js/functions.js index 572c857..3454a61 100644 --- a/js/functions.js +++ b/js/functions.js @@ -90,7 +90,7 @@ function parseVersionString (str) { * Indicates current available version on main page. */ function PMA_current_version() { - var current = parseVersionString('3.4.0'/*pmaversion*/); + var current = parseVersionString(pmaversion); var latest = parseVersionString(PMA_latest_version); $('#li_pma_version').append(PMA_messages['strLatestAvailable'] + ' ' + PMA_latest_version); if (latest > current) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0-1-g43b41e2
by Michal Čihař 13 May '11

13 May '11

The branch, MAINT_3_4_0 has been updated via 43b41e2ed3020edb1c26e821c6ed4f5065dd364c (commit) from 082d0e5c8ea1de4d6014a4a57de02104f1c383f4 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: js/functions.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/functions.js b/js/functions.js index 572c857..3454a61 100644 --- a/js/functions.js +++ b/js/functions.js @@ -90,7 +90,7 @@ function parseVersionString (str) { * Indicates current available version on main page. */ function PMA_current_version() { - var current = parseVersionString('3.4.0'/*pmaversion*/); + var current = parseVersionString(pmaversion); var latest = parseVersionString(PMA_latest_version); $('#li_pma_version').append(PMA_messages['strLatestAvailable'] + ' ' + PMA_latest_version); if (latest > current) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-154-g76a93ba
by Herman van Rink 13 May '11

13 May '11

The branch, master has been updated via 76a93bafdf69ece26e0492fbc903ec264456c6df (commit) via 584679c854920714516932d9ad11f7055530f464 (commit) via d45e09b3c6174374eb56cad8f9a3e6da423869e5 (commit) via b3f0c8f7edf2b615f8ea3540dfc928ec81ab8e5b (commit) via 6617a14297ef1f41933f93dfdf4cf5c2b79d76c9 (commit) from 3ff49129e11e9e6e9ba9fd6ca376fbf510c2ffb4 (commit) - Log ----------------------------------------------------------------- commit 76a93bafdf69ece26e0492fbc903ec264456c6df Merge: 3ff49129e11e9e6e9ba9fd6ca376fbf510c2ffb4 584679c854920714516932d9ad11f7055530f464 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri May 13 09:36:13 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 72 ++++++++++++++---------------------------------- 1 files changed, 21 insertions(+), 51 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index daf8a99..44adb0d 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -509,6 +509,8 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE) // g l o b a l o r d b - s p e c i f i c // + $privTable_names = array(0 => __('Data'), 1 => __('Structure'), 2 => __('Administration')); + // d a t a $privTable[0] = array( array('Select', 'SELECT', __('Allows reading data.')), @@ -582,59 +584,27 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE) . $GLOBALS['url_query'] . '" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', false); return false;">' . __('Uncheck All') . '</a>)' . "\n" . ' </legend>' . "\n" - . ' <p><small><i>' . __(' Note: MySQL privilege names are expressed in English ') . '</i></small></p>' . "\n" - . ' <fieldset>' . "\n" - . ' <legend>' . __('Data') . '</legend>' . "\n"; - foreach ($privTable[0] as $priv) - { - echo ' <div class="item">' . "\n" - . ' <input type="checkbox"' - . (empty($GLOBALS['checkall']) ? '' : ' checked="checked"') - . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] - . '_priv" value="Y" ' - . ($row[$priv[0] . '_priv'] == 'Y' ? 'checked="checked" ' : '') - . 'title="' . $priv[2] . '"/>' . "\n" - . ' <label for="checkbox_' . $priv[0] - . '_priv"><tt><dfn title="' . $priv[2] . '">' . $priv[1] - . '</dfn></tt></label>' . "\n" - . ' </div>' . "\n"; - } - echo ' </fieldset>' . "\n" - . ' <fieldset>' . "\n" - . ' <legend>' . __('Structure') . '</legend>' . "\n"; - foreach ($privTable[1] as $priv) - { - echo ' <div class="item">' . "\n" - . ' <input type="checkbox"' - . (empty($GLOBALS['checkall']) ? '' : ' checked="checked"') - . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] - . '_priv" value="Y" ' - . ($row[$priv[0] . '_priv'] == 'Y' ? 'checked="checked" ' : '') - . 'title="' . $priv[2] . '"/>' . "\n" - . ' <label for="checkbox_' . $priv[0] - . '_priv"><tt><dfn title="' . $priv[2] . '">' . $priv[1] - . '</dfn></tt></label>' . "\n" - . ' </div>' . "\n"; - } - echo ' </fieldset>' . "\n" - . ' <fieldset>' . "\n" - . ' <legend>' . __('Administration') . '</legend>' . "\n"; - foreach ($privTable[2] as $priv) - { - echo ' <div class="item">' . "\n" - . ' <input type="checkbox"' - . (empty($GLOBALS['checkall']) ? '' : ' checked="checked"') - . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] - . '_priv" value="Y" ' - . ($row[$priv[0] . '_priv'] == 'Y' ? 'checked="checked" ' : '') - . 'title="' . $priv[2] . '"/>' . "\n" - . ' <label for="checkbox_' . $priv[0] - . '_priv"><tt><dfn title="' . $priv[2] . '">' . $priv[1] - . '</dfn></tt></label>' . "\n" - . ' </div>' . "\n"; + . ' <p><small><i>' . __(' Note: MySQL privilege names are expressed in English ') . '</i></small></p>' . "\n"; + + // Output the Global privilege tables with checkboxes + foreach($privTable as $i => $table) { + echo ' <fieldset>' . "\n" + . ' <legend>' . __($privTable_names[$i]) . '</legend>' . "\n"; + foreach ($table as $priv) + { + echo ' <div class="item">' . "\n" + . ' <input type="checkbox"' + . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] . '_priv"' + . ' value="Y" title="' . $priv[2] . '"' + . ((!empty($GLOBALS['checkall']) || $row[$priv[0] . '_priv'] == 'Y') ? ' checked="checked"' : '') + . '/>' . "\n" + . ' <label for="checkbox_' . $priv[0] . '_priv"><tt><dfn title="' . $priv[2] . '">' + . $priv[1] . '</dfn></tt></label>' . "\n" + . ' </div>' . "\n"; + } + echo ' </fieldset>' . "\n"; } - echo ' </fieldset>' . "\n"; // The "Resource limits" box is not displayed for db-specific privs if ($db == '*') { echo ' <fieldset>' . "\n" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0-22-g584679c
by Herman van Rink 13 May '11

13 May '11

The branch, QA_3_4 has been updated via 584679c854920714516932d9ad11f7055530f464 (commit) via d45e09b3c6174374eb56cad8f9a3e6da423869e5 (commit) via b3f0c8f7edf2b615f8ea3540dfc928ec81ab8e5b (commit) via 6617a14297ef1f41933f93dfdf4cf5c2b79d76c9 (commit) from 900a5800892100ca4cefdc3d43b87861b110878e (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 72 ++++++++++++++---------------------------------- 1 files changed, 21 insertions(+), 51 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index 19f9dcb..19effc7 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -509,6 +509,8 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE) // g l o b a l o r d b - s p e c i f i c // + $privTable_names = array(0 => __('Data'), 1 => __('Structure'), 2 => __('Administration')); + // d a t a $privTable[0] = array( array('Select', 'SELECT', __('Allows reading data.')), @@ -582,59 +584,27 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE) . $GLOBALS['url_query'] . '" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', false); return false;">' . __('Uncheck All') . '</a>)' . "\n" . ' </legend>' . "\n" - . ' <p><small><i>' . __(' Note: MySQL privilege names are expressed in English ') . '</i></small></p>' . "\n" - . ' <fieldset>' . "\n" - . ' <legend>' . __('Data') . '</legend>' . "\n"; - foreach ($privTable[0] as $priv) - { - echo ' <div class="item">' . "\n" - . ' <input type="checkbox"' - . (empty($GLOBALS['checkall']) ? '' : ' checked="checked"') - . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] - . '_priv" value="Y" ' - . ($row[$priv[0] . '_priv'] == 'Y' ? 'checked="checked" ' : '') - . 'title="' . $priv[2] . '"/>' . "\n" - . ' <label for="checkbox_' . $priv[0] - . '_priv"><tt><dfn title="' . $priv[2] . '">' . $priv[1] - . '</dfn></tt></label>' . "\n" - . ' </div>' . "\n"; - } - echo ' </fieldset>' . "\n" - . ' <fieldset>' . "\n" - . ' <legend>' . __('Structure') . '</legend>' . "\n"; - foreach ($privTable[1] as $priv) - { - echo ' <div class="item">' . "\n" - . ' <input type="checkbox"' - . (empty($GLOBALS['checkall']) ? '' : ' checked="checked"') - . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] - . '_priv" value="Y" ' - . ($row[$priv[0] . '_priv'] == 'Y' ? 'checked="checked" ' : '') - . 'title="' . $priv[2] . '"/>' . "\n" - . ' <label for="checkbox_' . $priv[0] - . '_priv"><tt><dfn title="' . $priv[2] . '">' . $priv[1] - . '</dfn></tt></label>' . "\n" - . ' </div>' . "\n"; - } - echo ' </fieldset>' . "\n" - . ' <fieldset>' . "\n" - . ' <legend>' . __('Administration') . '</legend>' . "\n"; - foreach ($privTable[2] as $priv) - { - echo ' <div class="item">' . "\n" - . ' <input type="checkbox"' - . (empty($GLOBALS['checkall']) ? '' : ' checked="checked"') - . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] - . '_priv" value="Y" ' - . ($row[$priv[0] . '_priv'] == 'Y' ? 'checked="checked" ' : '') - . 'title="' . $priv[2] . '"/>' . "\n" - . ' <label for="checkbox_' . $priv[0] - . '_priv"><tt><dfn title="' . $priv[2] . '">' . $priv[1] - . '</dfn></tt></label>' . "\n" - . ' </div>' . "\n"; + . ' <p><small><i>' . __(' Note: MySQL privilege names are expressed in English ') . '</i></small></p>' . "\n"; + + // Output the Global privilege tables with checkboxes + foreach($privTable as $i => $table) { + echo ' <fieldset>' . "\n" + . ' <legend>' . __($privTable_names[$i]) . '</legend>' . "\n"; + foreach ($table as $priv) + { + echo ' <div class="item">' . "\n" + . ' <input type="checkbox"' + . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] . '_priv"' + . ' value="Y" title="' . $priv[2] . '"' + . ((!empty($GLOBALS['checkall']) || $row[$priv[0] . '_priv'] == 'Y') ? ' checked="checked"' : '') + . '/>' . "\n" + . ' <label for="checkbox_' . $priv[0] . '_priv"><tt><dfn title="' . $priv[2] . '">' + . $priv[1] . '</dfn></tt></label>' . "\n" + . ' </div>' . "\n"; + } + echo ' </fieldset>' . "\n"; } - echo ' </fieldset>' . "\n"; // The "Resource limits" box is not displayed for db-specific privs if ($db == '*') { echo ' <fieldset>' . "\n" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-149-g3ff4912
by Marc Delisle 12 May '11

12 May '11

The branch, master has been updated via 3ff49129e11e9e6e9ba9fd6ca376fbf510c2ffb4 (commit) via 900a5800892100ca4cefdc3d43b87861b110878e (commit) from 3d0499c185bdb33cb619600d97b62989c693d5b9 (commit) - Log ----------------------------------------------------------------- commit 3ff49129e11e9e6e9ba9fd6ca376fbf510c2ffb4 Merge: 3d0499c185bdb33cb619600d97b62989c693d5b9 900a5800892100ca4cefdc3d43b87861b110878e Author: Marc Delisle <marc(a)infomarc.info> Date: Thu May 12 12:59:28 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_synchronize.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23f11a9..7d471e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ + rfe #2021981 [interface] Add support for mass prefix change. 3.4.1.0 (not yet released) +- bug #3301108 [interface] Synchronize and already configured host 3.4.0.0 (2011-05-11) + rfe #2890226 [view] Enable VIEW rename diff --git a/server_synchronize.php b/server_synchronize.php index bb08fd6..d097059 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -1105,9 +1105,9 @@ if (isset($_REQUEST['synchronize_db'])) { 'ASC', 0, true); if ($GLOBALS['cfg']['AllowArbitraryServer'] === false) { - $possibly_disabled = ' disabled="disabled"'; + $possibly_readonly = ' readonly="readonly"'; } else { - $possibly_disabled = ''; + $possibly_readonly = ''; } foreach ($cons as $type) { @@ -1172,27 +1172,27 @@ if (isset($_REQUEST['synchronize_db'])) { </tr> <tr class="even toggler remote-server"> <td><?php echo __('Server'); ?></td> - <td><input type="text" name="<?php echo $type; ?>_host" class="server-host" <?php echo $possibly_disabled; ?>/></td> + <td><input type="text" name="<?php echo $type; ?>_host" class="server-host" <?php echo $possibly_readonly; ?>/></td> </tr> <tr class="odd toggler remote-server"> <td><?php echo __('Port'); ?></td> - <td><input type="text" name="<?php echo $type; ?>_port" class="server-port" <?php echo $possibly_disabled; ?> value="3306" maxlength="5" size="5" /></td> + <td><input type="text" name="<?php echo $type; ?>_port" class="server-port" <?php echo $possibly_readonly; ?> value="3306" maxlength="5" size="5" /></td> </tr> <tr class="even toggler remote-server"> <td><?php echo __('Socket'); ?></td> - <td><input type="text" name="<?php echo $type; ?>_socket" class="server-socket" <?php echo $possibly_disabled; ?>/></td> + <td><input type="text" name="<?php echo $type; ?>_socket" class="server-socket" <?php echo $possibly_readonly; ?>/></td> </tr> <tr class="odd toggler remote-server"> <td><?php echo __('User name'); ?></td> - <td><input type="text" name="<?php echo $type; ?>_username" class="server-user" <?php echo $possibly_disabled; ?>/></td> + <td><input type="text" name="<?php echo $type; ?>_username" class="server-user" <?php echo $possibly_readonly; ?>/></td> </tr> <tr class="even toggler remote-server"> <td><?php echo __('Password'); ?></td> - <td><input type="password" name="<?php echo $type; ?>_pass" class="server-pass" <?php echo $possibly_disabled; ?>/> </td> + <td><input type="password" name="<?php echo $type; ?>_pass" class="server-pass" /> </td> </tr> <tr class="odd toggler remote-server"> <td><?php echo __('Database'); ?></td> - <td><input type="text" name="<?php echo $type; ?>_db" class="server-db" <?php echo $possibly_disabled; ?>/></td> + <td><input type="text" name="<?php echo $type; ?>_db" class="server-db" /></td> </tr> <tr class="even toggler current-server" style="display: none;"> <td><?php echo __('Database'); ?></td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0-18-g900a580
by Marc Delisle 12 May '11

12 May '11

The branch, QA_3_4 has been updated via 900a5800892100ca4cefdc3d43b87861b110878e (commit) from 6cd25a93f6cb8bb9fd98ee2399930ea5e70fdc88 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_synchronize.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7715ad..e3a3871 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ ====================== 3.4.1.0 (not yet released) +- bug #3301108 [interface] Synchronize and already configured host 3.4.0.0 (2011-05-11) + rfe #2890226 [view] Enable VIEW rename diff --git a/server_synchronize.php b/server_synchronize.php index bb08fd6..d097059 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -1105,9 +1105,9 @@ if (isset($_REQUEST['synchronize_db'])) { 'ASC', 0, true); if ($GLOBALS['cfg']['AllowArbitraryServer'] === false) { - $possibly_disabled = ' disabled="disabled"'; + $possibly_readonly = ' readonly="readonly"'; } else { - $possibly_disabled = ''; + $possibly_readonly = ''; } foreach ($cons as $type) { @@ -1172,27 +1172,27 @@ if (isset($_REQUEST['synchronize_db'])) { </tr> <tr class="even toggler remote-server"> <td><?php echo __('Server'); ?></td> - <td><input type="text" name="<?php echo $type; ?>_host" class="server-host" <?php echo $possibly_disabled; ?>/></td> + <td><input type="text" name="<?php echo $type; ?>_host" class="server-host" <?php echo $possibly_readonly; ?>/></td> </tr> <tr class="odd toggler remote-server"> <td><?php echo __('Port'); ?></td> - <td><input type="text" name="<?php echo $type; ?>_port" class="server-port" <?php echo $possibly_disabled; ?> value="3306" maxlength="5" size="5" /></td> + <td><input type="text" name="<?php echo $type; ?>_port" class="server-port" <?php echo $possibly_readonly; ?> value="3306" maxlength="5" size="5" /></td> </tr> <tr class="even toggler remote-server"> <td><?php echo __('Socket'); ?></td> - <td><input type="text" name="<?php echo $type; ?>_socket" class="server-socket" <?php echo $possibly_disabled; ?>/></td> + <td><input type="text" name="<?php echo $type; ?>_socket" class="server-socket" <?php echo $possibly_readonly; ?>/></td> </tr> <tr class="odd toggler remote-server"> <td><?php echo __('User name'); ?></td> - <td><input type="text" name="<?php echo $type; ?>_username" class="server-user" <?php echo $possibly_disabled; ?>/></td> + <td><input type="text" name="<?php echo $type; ?>_username" class="server-user" <?php echo $possibly_readonly; ?>/></td> </tr> <tr class="even toggler remote-server"> <td><?php echo __('Password'); ?></td> - <td><input type="password" name="<?php echo $type; ?>_pass" class="server-pass" <?php echo $possibly_disabled; ?>/> </td> + <td><input type="password" name="<?php echo $type; ?>_pass" class="server-pass" /> </td> </tr> <tr class="odd toggler remote-server"> <td><?php echo __('Database'); ?></td> - <td><input type="text" name="<?php echo $type; ?>_db" class="server-db" <?php echo $possibly_disabled; ?>/></td> + <td><input type="text" name="<?php echo $type; ?>_db" class="server-db" /></td> </tr> <tr class="even toggler current-server" style="display: none;"> <td><?php echo __('Database'); ?></td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin scripts branch, master, updated. 1f0817a050058309bbb4dd24368ce33075f276dc
by Michal Čihař 12 May '11

12 May '11

The branch, master has been updated via 1f0817a050058309bbb4dd24368ce33075f276dc (commit) from 54346e4829e96ffb20ce1f6b0798510926d3ba2c (commit) - Log ----------------------------------------------------------------- commit 1f0817a050058309bbb4dd24368ce33075f276dc Author: Michal Čihař <michal(a)cihar.com> Date: Thu May 12 13:13:27 2011 +0200 Disable cia.vc bot as service is disabled ----------------------------------------------------------------------- Summary of changes: git-hooks/post-receive | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/git-hooks/post-receive b/git-hooks/post-receive index fa2aa3a..749a8f8 100755 --- a/git-hooks/post-receive +++ b/git-hooks/post-receive @@ -690,11 +690,11 @@ else fi echo 'Sending email...' generate_email $oldrev $newrev $refname | send_mail - echo 'CIAbot in progress...' - if [ -n "$cia_project" ]; then - for merged in $(git-rev-list $newrev ^$oldrev | tac); do - /gitrepo/p/ph/phpmyadmin/scripts/hooks/git-ciabot $refname $merged - done - fi +# echo 'CIAbot in progress...' +# if [ -n "$cia_project" ]; then +# for merged in $(git-rev-list $newrev ^$oldrev | tac); do +# /gitrepo/p/ph/phpmyadmin/scripts/hooks/git-ciabot $refname $merged +# done +# fi done fi hooks/post-receive -- phpMyAdmin scripts

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin scripts branch, master, updated. 54346e4829e96ffb20ce1f6b0798510926d3ba2c
by Michal Čihař 11 May '11

11 May '11

The branch, master has been updated via 54346e4829e96ffb20ce1f6b0798510926d3ba2c (commit) from e2932c42f0292cbed955817a378e5e0486d1ec82 (commit) - Log ----------------------------------------------------------------- commit 54346e4829e96ffb20ce1f6b0798510926d3ba2c Author: Michal Čihař <michal(a)cihar.com> Date: Wed May 11 16:14:49 2011 +0200 No mail for stable/testing branches ----------------------------------------------------------------------- Summary of changes: git-hooks/post-receive | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/git-hooks/post-receive b/git-hooks/post-receive index ead51fb..fa2aa3a 100755 --- a/git-hooks/post-receive +++ b/git-hooks/post-receive @@ -684,6 +684,10 @@ if [ -n "$1" -a -n "$2" -a -n "$3" ]; then else while read oldrev newrev refname do + if [ $refname = STABLE -o $refname = TESTING ] ; then + echo "Skipped sending mail for $refname branch" + continue + fi echo 'Sending email...' generate_email $oldrev $newrev $refname | send_mail echo 'CIAbot in progress...' hooks/post-receive -- phpMyAdmin scripts

1 0