diff --git a/ChangeLog b/ChangeLog
index bd423ebf5..f9ec21d78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
+ [lang] Turkish update, thanks to Burak Yavuz
+ rfe #2963310 [interface] Focus TEXTAREA "sql_query" on click on "SQL" link
+ [lang] Uzbek update, thanks to Orzu Samarqandiy
++ rfe #2958013 [import] After import, also list uploaded filename, thanks
+ to Pavel Konnikov and Herman van Rink
3.3.2.0 (not yet released)
- patch #2969449 [core] Name for MERGE engine varies depending on the
@@ -57,6 +59,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #2967366 [Structure] Some results of Propose table structure are
shown in hex
- bug #2967565 [insert] UNHEX not selected by default when inserting BINARY
+- [navi] Changed link to git repository on main page
+- bug #2972232 [menu] Import menu tab not present on main page
3.3.1.0 (2010-03-16)
- bug #2941037 [core] Database structure not sorted by table correctly
@@ -69,6 +73,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
thanks to Dieter Adriaenssens - ruleant
- bug #2961198 [parser] Querying a table named "data"
- bug #2931429 [structure] Editing long triggers
+- bug #2970769 [structure] Incorrect reference to mootools-more.js
3.3.0.0 (2010-03-07)
+ rfe #2308632 [edit] Use hex for (var)binary fields,
diff --git a/Documentation.html b/Documentation.html
index bb1c27d96..4c5157dde 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1115,7 +1115,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE
$cfg['Servers'][$i]['tracking_version_drop_view'] boolean
- Whether a DROP VIEW IF EXISTS statement will added as first line to the log when creating a view. Default value is true.
+ Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view. Default value is true.
@@ -1124,7 +1124,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE
$cfg['Servers'][$i]['tracking_version_drop_table'] boolean
- Whether a DROP TABLE IF EXISTS statement will added as first line to the log when creating a table. Default value is true.
+ Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table. Default value is true.
@@ -1132,7 +1132,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE
$cfg['Servers'][$i]['tracking_version_drop_database'] boolean
- Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. Default value is true.
+ Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. Default value is true.
diff --git a/import.php b/import.php
index 7aa6088fb..7f06ceb74 100644
--- a/import.php
+++ b/import.php
@@ -411,9 +411,11 @@ if (!empty($id_bookmark) && $action_bookmark == 2) {
$message->addParam($executed_queries);
$message->addString($import_notice);
+ $message->addString('(' . $_FILES['import_file']['name'] . ')');
} else {
$message = PMA_Message::success('strImportSuccessfullyFinished');
$message->addParam($executed_queries);
+ $message->addString('(' . $_FILES['import_file']['name'] . ')');
}
}
}
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 3f56bd1d4..653fc53a1 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -446,7 +446,7 @@ $cfg['Servers'][$i]['tracking_default_statements'] = 'CREATE TABLE,ALTER TABLE,D
'CREATE DATABASE,ALTER DATABASE,DROP DATABASE';
/**
- * Whether a DROP VIEW IF EXISTS statement will added as first line to the log when creating a view.
+ * Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view.
*
* @global bool $cfg['Servers'][$i]['tracking_add_drop_view']
*/
@@ -454,7 +454,7 @@ $cfg['Servers'][$i]['tracking_default_statements'] = 'CREATE TABLE,ALTER TABLE,D
$cfg['Servers'][$i]['tracking_add_drop_view'] = true;
/**
- * Whether a DROP TABLE IF EXISTS statement will added as first line to the log when creating a table.
+ * Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table.
*
* @global bool $cfg['Servers'][$i]['tracking_add_drop_table']
*/
@@ -462,7 +462,7 @@ $cfg['Servers'][$i]['tracking_add_drop_view'] = true;
$cfg['Servers'][$i]['tracking_add_drop_table'] = true;
/**
- * Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database.
+ * Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database.
*
* @global bool $cfg['Servers'][$i]['tracking_add_drop_database']
*/
@@ -470,7 +470,7 @@ $cfg['Servers'][$i]['tracking_add_drop_table'] = true;
$cfg['Servers'][$i]['tracking_add_drop_database'] = true;
/**
- * Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database.
+ * Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database.
*
* @global bool $cfg['Servers'][$i]['tracking_version_drop_database']
*/
diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
index 1366baa7b..40479d2c4 100644
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -87,9 +87,9 @@ $tabs['import']['icon'] = 'b_import.png';
$tabs['import']['link'] = 'server_import.php';
$tabs['import']['text'] = $strImport;
-$tabs['import']['icon'] = 's_sync.png';
-$tabs['import']['link'] = 'server_synchronize.php';
-$tabs['import']['text'] = $strSynchronize;
+$tabs['synchronize']['icon'] = 's_sync.png';
+$tabs['synchronize']['link'] = 'server_synchronize.php';
+$tabs['synchronize']['text'] = $strSynchronize;
echo PMA_generate_html_tabs($tabs, array());
unset($tabs);
diff --git a/main.php b/main.php
index 7f6ba61e3..ef9c6b588 100644
--- a/main.php
+++ b/main.php
@@ -239,8 +239,8 @@ PMA_printListItem($strHomepageOfficial, 'li_pma_homepage', 'http://www.phpMyAdmi
?>
[ChangeLog]
- [Subversion]
+ [Git]
[Lists]
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 8c321be4d..88ea4429d 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -35,37 +35,6 @@ shift
branch=$1
shift
-# Create working copy
-mkdir -p release
-workdir=release/phpMyAdmin-$version
-if [ -d $workdir ] ; then
- echo "Working directory '$workdir' already exists, please move it out of way"
- exit 1
-fi
-git clone --local . $workdir
-cd $workdir
-
-# Checkout branch
-git checkout $branch
-
-# Check release version
-if ! grep -q "'PMA_VERSION', '$version'" libraries/Config.class.php ; then
- echo "There seems to be wrong version in libraries/Config.class.php!"
- exit 2
-fi
-if ! grep -q "phpMyAdmin $version - Documentation" Documentation.html ; then
- echo "There seems to be wrong version in Documentation.html"
- exit 2
-fi
-if ! grep -q "phpMyAdmin $version - Official translators" translators.html ; then
- echo "There seems to be wrong version in translators.html"
- exit 2
-fi
-if ! grep -q "Version $version\$" README ; then
- echo "There seems to be wrong version in README"
- exit 2
-fi
-
cat < RELEASE-DATE-${version}
@@ -216,8 +215,8 @@ cat <