22 Mar
2010
22 Mar
'10
7:48 p.m.
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
<p> The following method is preferred for new developers:</p>
-<ol><li>fetch the current SVN tree over anonymous SVN:<br />
- <tt>svn co
https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin&…
/>
+<ol><li>fetch the current git repository over anonymous git:<br />
+ <tt>git clone
+
git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt&g… />
</li>
<li>add your stuff</li>
<li>generate patch with your changes:
- <tt>svn diff</tt><br />
+ <tt>git diff > xxx.diff</tt><br />
</li>
- <li>put the patch inside the <a
+ <li>submit your patch via the <a
href="https://sourceforge.net/tracker/?group_id=23067&atid=377…
tracker of the phpMyAdmin project</a>.
</li>
</ol>
-<p> Write access to the SVN tree is granted only to experienced developers who
+<p>More details on git are available on <a
href="http://wiki.phpmyadmin.net/pma/Devel:git">our
wiki</a>.</p>
+
+<p> Write access to the repository is granted only to experienced developers who
have already contributed something useful to phpMyAdmin.<br />
Also, have a look at the <a href="#developers">Developers
section</a>.</p>
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