- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-256-g684e532
by Marc Delisle 23 Mar '10

23 Mar '10

The branch, master has been updated via 684e53236d42f7b1db518601691739b41aac0634 (commit) via e8d86a5869d45a5e019bf9460d5fb0c9b398216f (commit) from 6035f20e8de66ff46820acf5d5cb51282aecb107 (commit) - Log ----------------------------------------------------------------- commit 684e53236d42f7b1db518601691739b41aac0634 Merge: 6035f20e8de66ff46820acf5d5cb51282aecb107 e8d86a5869d45a5e019bf9460d5fb0c9b398216f Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Mar 23 12:20:28 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: libraries/db_events.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php index 5f99a8b..9ff5f76 100644 --- a/libraries/db_events.inc.php +++ b/libraries/db_events.inc.php @@ -51,7 +51,7 @@ if ($events) { ($ct%2 == 0) ? 'even' : 'odd', $event['EVENT_NAME'], ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&sql_query=' . urlencode($definition) . '&show_query=1&delimiter=' . urlencode($delimiter), $titles['Structure']) : ' ', - '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($sqlDrop, false) . '\')">' . $titles['Drop'] . '</a>', + '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($sqlDrop, false) . '\')">' . $titles['Drop'] . '</a>', $event['EVENT_TYPE']); $ct++; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-70-ge8d86a5
by Marc Delisle 23 Mar '10

23 Mar '10

The branch, QA_3_3 has been updated via e8d86a5869d45a5e019bf9460d5fb0c9b398216f (commit) from 6810e568f61cab1adbb23f34f6b4d07cbd971184 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/db_events.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php index 5f99a8b..9ff5f76 100644 --- a/libraries/db_events.inc.php +++ b/libraries/db_events.inc.php @@ -51,7 +51,7 @@ if ($events) { ($ct%2 == 0) ? 'even' : 'odd', $event['EVENT_NAME'], ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&sql_query=' . urlencode($definition) . '&show_query=1&delimiter=' . urlencode($delimiter), $titles['Structure']) : ' ', - '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($sqlDrop, false) . '\')">' . $titles['Drop'] . '</a>', + '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($sqlDrop, false) . '\')">' . $titles['Drop'] . '</a>', $event['EVENT_TYPE']); $ct++; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-254-g6035f20
by Michal Čihař 22 Mar '10

22 Mar '10

The branch, master has been updated via 6035f20e8de66ff46820acf5d5cb51282aecb107 (commit) via 6810e568f61cab1adbb23f34f6b4d07cbd971184 (commit) from ceb7427eba44a565de39599807d6a78ae7245fb8 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index 081abd2..e7880a9 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4348,7 +4348,7 @@ chmod o+rwx tmp </li> <li>add your stuff</li> <li>generate patch with your changes: - <tt>git diff > xxx.diff</tt> + <tt>git diff > xxx.diff</tt> </li> <li>submit your patch via the <a href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">patch hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, updated. RELEASE_3_3_1RC1-803-g2b0cc1d
by Michal Čihař 22 Mar '10

22 Mar '10

The branch, gettext has been updated via 2b0cc1d9fc7a344ac2a009549a3eb5e1baed8d0b (commit) via 6035f20e8de66ff46820acf5d5cb51282aecb107 (commit) via 6810e568f61cab1adbb23f34f6b4d07cbd971184 (commit) via ceb7427eba44a565de39599807d6a78ae7245fb8 (commit) via 82905fa361f54701226cc580e3dc2561e4427ca4 (commit) via 16886bc3fb49d357fb583d7e28c51de99103280a (commit) via 975d4650de7606de6218d5cc4fd97cc7cc825071 (commit) via 0f6215f70ed47a1c26743dab636fb74042d98833 (commit) via e859e311496ae25e1c6de6412084bc336f0798b9 (commit) via cdfc277bb7bd3b8fad0e45d9317fdd4578282206 (commit) from 853fee7ec595c360a1c1d8960bd69a9b926763d4 (commit) - Log ----------------------------------------------------------------- commit 2b0cc1d9fc7a344ac2a009549a3eb5e1baed8d0b Merge: 853fee7ec595c360a1c1d8960bd69a9b926763d4 6035f20e8de66ff46820acf5d5cb51282aecb107 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Mar 22 23:48:16 2010 +0100 Merge branch 'master' into gettext ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 13 ++++++++----- db_structure.php | 5 +++-- tbl_row_action.php | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9ec21d..69a860d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + [lang] Uzbek update, thanks to Orzu Samarqandiy + rfe #2958013 [import] After import, also list uploaded filename, thanks to Pavel Konnikov and Herman van Rink ++ patch #2974341 [structure] Clicking on table name in db Structure should + Browse the table if possible, thanks to bhdouglass - dougboybhd 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/Documentation.html b/Documentation.html index 4c5157d..e7880a9 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4342,20 +4342,23 @@ chmod o+rwx tmp The following method is preferred for new developers: -<ol><li>fetch the current SVN tree over anonymous SVN: - <tt>svn co https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin</tt> +<ol><li>fetch the current git repository over anonymous git: + <tt>git clone + git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt> </li> <li>add your stuff</li> <li>generate patch with your changes: - <tt>svn diff</tt> + <tt>git diff > xxx.diff</tt> </li> - <li>put the patch inside the <a + <li>submit your patch via the <a href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">patch tracker of the phpMyAdmin project</a>. </li> </ol> - Write access to the SVN tree is granted only to experienced developers who +More details on git are available on <a href="http://wiki.phpmyadmin.net/pma/Devel:git">our wiki</a>. + + Write access to the repository is granted only to experienced developers who have already contributed something useful to phpMyAdmin. Also, have a look at the <a href="#developers">Developers section</a>. diff --git a/db_structure.php b/db_structure.php index 2111edd..a4d99cb 100644 --- a/db_structure.php +++ b/db_structure.php @@ -300,9 +300,11 @@ foreach ($tables as $keyname => $each_table) { if ($each_table['TABLE_ROWS'] > 0) { $browse_table = '<a href="sql.php?' . $tbl_url_query . '&pos=0">' . $titles['Browse'] . '</a>'; $search_table = '<a href="tbl_select.php?' . $tbl_url_query . '">' . $titles['Search'] . '</a>'; + $browse_table_label = '<a href="sql.php?' . $tbl_url_query . '&pos=0">' . $truename . '</a>'; } else { $browse_table = $titles['NoBrowse']; $search_table = $titles['NoSearch']; + $browse_table_label = '<a href="tbl_structure.php?' . $tbl_url_query . '">' . $truename . '</a>'; } if (! $db_is_information_schema) { @@ -382,8 +384,7 @@ foreach ($tables as $keyname => $each_table) { <input type="checkbox" name="selected_tbl[]" value="<?php echo htmlspecialchars($each_table['TABLE_NAME']); ?>" id="checkbox_tbl_<?php echo $i; ?>"<?php echo $checked; ?> /></td> - <th><label for="checkbox_tbl_<?php echo $i; ?>" - title="<?php echo $alias; ?>" style="<?php echo $ignored ? ' ignored' : ''; ?>"><?php echo $truename; ?></label> + <th><?php echo $browse_table_label; ?> <?php echo (! empty($tracking_icon) ? $tracking_icon : ''); ?> </th> <?php if ($server_slave_status) { ?><td align="center"><?php echo $ignored ? ' <img class="icon" src="' . $pmaThemeImage . 's_cancel.png" width="16" height="16" alt="NOT REPLICATED" />' : ''. $do ? ' <img class="icon" src="' . $pmaThemeImage . 's_success.png" width="16" height="16" alt="REPLICATED" />' : ''; ?></td><?php } ?> diff --git a/tbl_row_action.php b/tbl_row_action.php index d72c7d5..efcc74d 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -43,7 +43,7 @@ if (isset($_REQUEST['submit_mult'])) { $submit_mult = 'row_export'; } -// garvin: If the 'Ask for confirmation' button was pressed, this can only come +// If the 'Ask for confirmation' button was pressed, this can only come // from 'delete' mode, so we set it straight away. if (isset($_REQUEST['mult_btn'])) { $submit_mult = 'row_delete'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-69-g6810e56
by Michal Čihař 22 Mar '10

22 Mar '10

The branch, QA_3_3 has been updated via 6810e568f61cab1adbb23f34f6b4d07cbd971184 (commit) from 82905fa361f54701226cc580e3dc2561e4427ca4 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index eaf3a2e..486af10 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4332,7 +4332,7 @@ chmod o+rwx tmp </li> <li>add your stuff</li> <li>generate patch with your changes: - <tt>git diff > xxx.diff</tt> + <tt>git diff > xxx.diff</tt> </li> <li>submit your patch via the <a href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">patch hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-252-gceb7427
by Marc Delisle 22 Mar '10

22 Mar '10

The branch, master has been updated via ceb7427eba44a565de39599807d6a78ae7245fb8 (commit) via 82905fa361f54701226cc580e3dc2561e4427ca4 (commit) from 16886bc3fb49d357fb583d7e28c51de99103280a (commit) - Log ----------------------------------------------------------------- commit ceb7427eba44a565de39599807d6a78ae7245fb8 Merge: 16886bc3fb49d357fb583d7e28c51de99103280a 82905fa361f54701226cc580e3dc2561e4427ca4 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Mar 22 18:06:30 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: Documentation.html | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Documentation.html b/Documentation.html index 4c5157d..081abd2 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4342,20 +4342,23 @@ chmod o+rwx tmp The following method is preferred for new developers: -<ol><li>fetch the current SVN tree over anonymous SVN: - <tt>svn co https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin</tt> +<ol><li>fetch the current git repository over anonymous git: + <tt>git clone + git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt> </li> <li>add your stuff</li> <li>generate patch with your changes: - <tt>svn diff</tt> + <tt>git diff > xxx.diff</tt> </li> - <li>put the patch inside the <a + <li>submit your patch via the <a href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">patch tracker of the phpMyAdmin project</a>. </li> </ol> - Write access to the SVN tree is granted only to experienced developers who +More details on git are available on <a href="http://wiki.phpmyadmin.net/pma/Devel:git">our wiki</a>. + + Write access to the repository is granted only to experienced developers who have already contributed something useful to phpMyAdmin. Also, have a look at the <a href="#developers">Developers section</a>. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-68-g82905fa
by Marc Delisle 22 Mar '10

22 Mar '10

The branch, QA_3_3 has been updated via 82905fa361f54701226cc580e3dc2561e4427ca4 (commit) from 0f6215f70ed47a1c26743dab636fb74042d98833 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Documentation.html | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Documentation.html b/Documentation.html index 6656c0e..eaf3a2e 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4326,20 +4326,23 @@ chmod o+rwx tmp The following method is preferred for new developers: -<ol><li>fetch the current SVN tree over anonymous SVN: - <tt>svn co https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin</tt> +<ol><li>fetch the current git repository over anonymous git: + <tt>git clone + git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt> </li> <li>add your stuff</li> <li>generate patch with your changes: - <tt>svn diff</tt> + <tt>git diff > xxx.diff</tt> </li> - <li>put the patch inside the <a + <li>submit your patch via the <a href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">patch tracker of the phpMyAdmin project</a>. </li> </ol> - Write access to the SVN tree is granted only to experienced developers who +More details on git are available on <a href="http://wiki.phpmyadmin.net/pma/Devel:git">our wiki</a>. + + Write access to the repository is granted only to experienced developers who have already contributed something useful to phpMyAdmin. Also, have a look at the <a href="#developers">Developers section</a>. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-250-g16886bc
by Marc Delisle 22 Mar '10

22 Mar '10

The branch, master has been updated via 16886bc3fb49d357fb583d7e28c51de99103280a (commit) from 975d4650de7606de6218d5cc4fd97cc7cc825071 (commit) - Log ----------------------------------------------------------------- commit 16886bc3fb49d357fb583d7e28c51de99103280a Author: bhdouglass <dougboybhd(a)users.sourceforge.net> Date: Mon Mar 22 17:40:04 2010 -0400 Patch #2974341 In db Structure, clicking on table name should Browse if possible ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ db_structure.php | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9ec21d..69a860d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + [lang] Uzbek update, thanks to Orzu Samarqandiy + rfe #2958013 [import] After import, also list uploaded filename, thanks to Pavel Konnikov and Herman van Rink ++ patch #2974341 [structure] Clicking on table name in db Structure should + Browse the table if possible, thanks to bhdouglass - dougboybhd 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/db_structure.php b/db_structure.php index 2111edd..a4d99cb 100644 --- a/db_structure.php +++ b/db_structure.php @@ -300,9 +300,11 @@ foreach ($tables as $keyname => $each_table) { if ($each_table['TABLE_ROWS'] > 0) { $browse_table = '<a href="sql.php?' . $tbl_url_query . '&pos=0">' . $titles['Browse'] . '</a>'; $search_table = '<a href="tbl_select.php?' . $tbl_url_query . '">' . $titles['Search'] . '</a>'; + $browse_table_label = '<a href="sql.php?' . $tbl_url_query . '&pos=0">' . $truename . '</a>'; } else { $browse_table = $titles['NoBrowse']; $search_table = $titles['NoSearch']; + $browse_table_label = '<a href="tbl_structure.php?' . $tbl_url_query . '">' . $truename . '</a>'; } if (! $db_is_information_schema) { @@ -382,8 +384,7 @@ foreach ($tables as $keyname => $each_table) { <input type="checkbox" name="selected_tbl[]" value="<?php echo htmlspecialchars($each_table['TABLE_NAME']); ?>" id="checkbox_tbl_<?php echo $i; ?>"<?php echo $checked; ?> /></td> - <th><label for="checkbox_tbl_<?php echo $i; ?>" - title="<?php echo $alias; ?>" style="<?php echo $ignored ? ' ignored' : ''; ?>"><?php echo $truename; ?></label> + <th><?php echo $browse_table_label; ?> <?php echo (! empty($tracking_icon) ? $tracking_icon : ''); ?> </th> <?php if ($server_slave_status) { ?><td align="center"><?php echo $ignored ? ' <img class="icon" src="' . $pmaThemeImage . 's_cancel.png" width="16" height="16" alt="NOT REPLICATED" />' : ''. $do ? ' <img class="icon" src="' . $pmaThemeImage . 's_success.png" width="16" height="16" alt="REPLICATED" />' : ''; ?></td><?php } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-249-g975d465
by Marc Delisle 22 Mar '10

22 Mar '10

The branch, master has been updated via 975d4650de7606de6218d5cc4fd97cc7cc825071 (commit) via 0f6215f70ed47a1c26743dab636fb74042d98833 (commit) via e859e311496ae25e1c6de6412084bc336f0798b9 (commit) via cdfc277bb7bd3b8fad0e45d9317fdd4578282206 (commit) from f8fa3b4ede1e056be9ac903eb8900d1bb18db086 (commit) - Log ----------------------------------------------------------------- commit 975d4650de7606de6218d5cc4fd97cc7cc825071 Merge: f8fa3b4ede1e056be9ac903eb8900d1bb18db086 0f6215f70ed47a1c26743dab636fb74042d98833 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Mar 22 13:25:07 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: tbl_row_action.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_row_action.php b/tbl_row_action.php index d72c7d5..efcc74d 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -43,7 +43,7 @@ if (isset($_REQUEST['submit_mult'])) { $submit_mult = 'row_export'; } -// garvin: If the 'Ask for confirmation' button was pressed, this can only come +// If the 'Ask for confirmation' button was pressed, this can only come // from 'delete' mode, so we set it straight away. if (isset($_REQUEST['mult_btn'])) { $submit_mult = 'row_delete'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-67-g0f6215f
by Marc Delisle 22 Mar '10

22 Mar '10

The branch, QA_3_3 has been updated via 0f6215f70ed47a1c26743dab636fb74042d98833 (commit) from e859e311496ae25e1c6de6412084bc336f0798b9 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: tbl_row_action.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_row_action.php b/tbl_row_action.php index d72c7d5..efcc74d 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -43,7 +43,7 @@ if (isset($_REQUEST['submit_mult'])) { $submit_mult = 'row_export'; } -// garvin: If the 'Ask for confirmation' button was pressed, this can only come +// If the 'Ask for confirmation' button was pressed, this can only come // from 'delete' mode, so we set it straight away. if (isset($_REQUEST['mult_btn'])) { $submit_mult = 'row_delete'; hooks/post-receive -- phpMyAdmin

1 0