May 2011 - Git - lists.phpmyadmin.net

[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

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

11 May '11

The branch, master has been updated via 3d0499c185bdb33cb619600d97b62989c693d5b9 (commit) via 6cd25a93f6cb8bb9fd98ee2399930ea5e70fdc88 (commit) from 4bcbd156e45320e6483d8c4673d81b05a54c8b3b (commit) - Log ----------------------------------------------------------------- commit 3d0499c185bdb33cb619600d97b62989c693d5b9 Merge: 4bcbd156e45320e6483d8c4673d81b05a54c8b3b 6cd25a93f6cb8bb9fd98ee2399930ea5e70fdc88 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed May 11 14:50:40 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 libraries/transformations/generator.sh mode change 100644 => 100755 libraries/transformations/template_generator.sh mode change 100644 => 100755 libraries/transformations/template_generator_mimetype.sh diff --git a/libraries/transformations/generator.sh b/libraries/transformations/generator.sh old mode 100644 new mode 100755 diff --git a/libraries/transformations/template_generator.sh b/libraries/transformations/template_generator.sh old mode 100644 new mode 100755 diff --git a/libraries/transformations/template_generator_mimetype.sh b/libraries/transformations/template_generator_mimetype.sh old mode 100644 new mode 100755 hooks/post-receive -- phpMyAdmin

1 0

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

11 May '11

The branch, QA_3_4 has been updated via 6cd25a93f6cb8bb9fd98ee2399930ea5e70fdc88 (commit) from 655f72e47459abd2220b96962b334e299be9889f (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 libraries/transformations/generator.sh mode change 100644 => 100755 libraries/transformations/template_generator.sh mode change 100644 => 100755 libraries/transformations/template_generator_mimetype.sh diff --git a/libraries/transformations/generator.sh b/libraries/transformations/generator.sh old mode 100644 new mode 100755 diff --git a/libraries/transformations/template_generator.sh b/libraries/transformations/template_generator.sh old mode 100644 new mode 100755 diff --git a/libraries/transformations/template_generator_mimetype.sh b/libraries/transformations/template_generator_mimetype.sh old mode 100644 new mode 100755 hooks/post-receive -- phpMyAdmin

1 0

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

11 May '11

The branch, master has been updated via 4bcbd156e45320e6483d8c4673d81b05a54c8b3b (commit) via 655f72e47459abd2220b96962b334e299be9889f (commit) from a4ac8d6becbe8676771def662a900d47216823c7 (commit) - Log ----------------------------------------------------------------- commit 4bcbd156e45320e6483d8c4673d81b05a54c8b3b Merge: a4ac8d6becbe8676771def662a900d47216823c7 655f72e47459abd2220b96962b334e299be9889f Author: Michal Čihař <mcihar(a)novell.com> Date: Wed May 11 14:47:32 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 libraries/php-gettext/gettext.php diff --git a/libraries/php-gettext/gettext.php b/libraries/php-gettext/gettext.php old mode 100755 new mode 100644 hooks/post-receive -- phpMyAdmin

1 0

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

11 May '11

The branch, QA_3_4 has been updated via 655f72e47459abd2220b96962b334e299be9889f (commit) from 072bc8de79f1cf58cded1c4f1b4d3b97590e0a79 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 libraries/php-gettext/gettext.php diff --git a/libraries/php-gettext/gettext.php b/libraries/php-gettext/gettext.php old mode 100755 new mode 100644 hooks/post-receive -- phpMyAdmin

1 0

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

11 May '11

The branch, master has been updated via a4ac8d6becbe8676771def662a900d47216823c7 (commit) via 072bc8de79f1cf58cded1c4f1b4d3b97590e0a79 (commit) from 8f49a1a642b2248ebd4d3cfd0f57cf14a20cd72c (commit) - Log ----------------------------------------------------------------- commit a4ac8d6becbe8676771def662a900d47216823c7 Merge: 8f49a1a642b2248ebd4d3cfd0f57cf14a20cd72c 072bc8de79f1cf58cded1c4f1b4d3b97590e0a79 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed May 11 14:45:57 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: scripts/remove-incomplete-mo | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/scripts/remove-incomplete-mo b/scripts/remove-incomplete-mo index 02069f9..d9e485c 100755 --- a/scripts/remove-incomplete-mo +++ b/scripts/remove-incomplete-mo @@ -51,6 +51,8 @@ check() { if [ $PERCENT -lt $THRESHOLD ] ; then echo "Removing $lang, only $PERCENT%" rm -f locale/$lang/LC_MESSAGES/phpmyadmin.mo + rmdir locale/$lang/LC_MESSAGES + rmdir locale/$lang fi } hooks/post-receive -- phpMyAdmin

1 0

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

11 May '11

The branch, QA_3_4 has been updated via 072bc8de79f1cf58cded1c4f1b4d3b97590e0a79 (commit) from 5687ac290e64ad82c9dc709a8d0850b7e8a99198 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: scripts/remove-incomplete-mo | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/scripts/remove-incomplete-mo b/scripts/remove-incomplete-mo index 02069f9..d9e485c 100755 --- a/scripts/remove-incomplete-mo +++ b/scripts/remove-incomplete-mo @@ -51,6 +51,8 @@ check() { if [ $PERCENT -lt $THRESHOLD ] ; then echo "Removing $lang, only $PERCENT%" rm -f locale/$lang/LC_MESSAGES/phpmyadmin.mo + rmdir locale/$lang/LC_MESSAGES + rmdir locale/$lang fi } hooks/post-receive -- phpMyAdmin

1 0

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

11 May '11

The branch, master has been updated via 8f49a1a642b2248ebd4d3cfd0f57cf14a20cd72c (commit) from 21766b684be69f185b85c61d6da07af02d5d71b2 (commit) - Log ----------------------------------------------------------------- commit 8f49a1a642b2248ebd4d3cfd0f57cf14a20cd72c Author: Michal Čihař <mcihar(a)novell.com> Date: Wed May 11 14:18:52 2011 +0200 Adjust STABLE/TESTING marking for new major release (in case there will ever be bugfix for 3.3). ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index cd91e99..0589c28 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -241,17 +241,15 @@ if [ $# -gt 0 ] ; then git tag -a -m "Released $version" $tagname $branch if echo $version | grep -q '^2\.11\.' ; then echo '* 2.11 branch, no STABLE/TESTING update' + elif echo $version | grep -q '^3\.3\.' ; then + echo '* 3.3 branch, no STABLE/TESTING update' else if echo $version | grep '[a-z_-]' ; then mark_as_release $branch TESTING else # We update both branches here # As it does not make sense to have older testing than stable - if echo $version | grep -q '^3\.3\.' ; then - echo '* 3.3 branch, no TESTING update' - else - mark_as_release $branch TESTING - fi + mark_as_release $branch TESTING mark_as_release $branch STABLE fi git checkout master hooks/post-receive -- phpMyAdmin

1 0