- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0ALPHA1-548-g412377c
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, QA_3_4 has been updated via 412377ca52f56675db13d3bd1627ae82dc1d02e7 (commit) from 1486abddef7f4e5e317b4a27fee01849d7b429b0 (commit) - Log ----------------------------------------------------------------- commit 412377ca52f56675db13d3bd1627ae82dc1d02e7 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 12:46:51 2010 -0500 missing title ----------------------------------------------------------------------- Summary of changes: libraries/header.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 33531ea..6ce37b8 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -122,7 +122,7 @@ if (!$GLOBALS['is_ajax_request']) { $GLOBALS['cfg']['DefaultTabDatabase'], PMA_generate_common_url($GLOBALS['db']), $GLOBALS['db'], - '', + __('Database'), 's_tbl.png'); // if the table is being dropped, $_REQUEST['purge'] is set // (it always contains "1") hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0ALPHA1-531-g268628e
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, MAINT_3_4_0 has been updated via 268628e5ffe7ed2a74d912a43a6e53db186867c2 (commit) from 1aff32ac2c5a1f91ce6656970136d34966ca0e4c (commit) - Log ----------------------------------------------------------------- commit 268628e5ffe7ed2a74d912a43a6e53db186867c2 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 12:46:51 2010 -0500 missing title ----------------------------------------------------------------------- Summary of changes: libraries/header.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 33531ea..6ce37b8 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -122,7 +122,7 @@ if (!$GLOBALS['is_ajax_request']) { $GLOBALS['cfg']['DefaultTabDatabase'], PMA_generate_common_url($GLOBALS['db']), $GLOBALS['db'], - '', + __('Database'), 's_tbl.png'); // if the table is being dropped, $_REQUEST['purge'] is set // (it always contains "1") hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA1-1124-gbd76d17
by Michal Čihař 26 Nov '10

26 Nov '10

The branch, master has been updated via bd76d17837234cb2edf8ff82ed91f6b263f5af5d (commit) via d013e387e8ca662abf3e6d65495fbe42c2924162 (commit) via 1486abddef7f4e5e317b4a27fee01849d7b429b0 (commit) via 1aff32ac2c5a1f91ce6656970136d34966ca0e4c (commit) via de139609e8fc30aafe15833716e2398d1ef3907d (commit) via 349180ef97641bcf84cfd140b4e3100ad5830942 (commit) via 17ee6f349c33bb2d096d48c1b9bda4f3d47133c0 (commit) via 7b5bfe2478c4e4627e3bd392cb03b07de57945ac (commit) via e13e48bd858c413d495ec626741161ee4b6ede9c (commit) via c490c396043f83431e9250287f7b3ecfee580ff8 (commit) via 8e515b1686587dd4ccc1a03a0c74abeea572ee14 (commit) via 36d5c50947c811064303976723604d6eae9e8b94 (commit) via 2e48d14e570971d18bc84e0dd186cb6bc07d1616 (commit) via d4a2f92120c827e2c279b9041293c60f4dce9826 (commit) via 5d2af71bc64de8035b27a4bad16aeddccc36830f (commit) via bf88b504bbebd1248d4917477394bf664b569f8e (commit) via 610d2e1610b3dd4ce966f3b75df860b4ac77d2c7 (commit) via 2b66c0e1659a06e8d06f6ae45d10d065a035803a (commit) via dfb33f36a0c18426091129f26fdef33d1d11a8c1 (commit) via 39cb896a5b16759417eedc36dc268839d97f60bf (commit) via cc77728e09964d40b0d78c0284a9fb2e1ce3f68d (commit) via 968a8d2ad72a831a3447b3e9785da21878ee7fed (commit) via e90aebf71be2fd26e464e6d33f753ce925eb6ff4 (commit) via 3f12de1746a25fe8f34d5892c21ae899356483be (commit) via 3f95ef5c20691037ec7c6dac06df3a8ded53523e (commit) from 87fa9bd524efe78c45d79f05ccec83612e03c9e4 (commit) - Log ----------------------------------------------------------------- commit bd76d17837234cb2edf8ff82ed91f6b263f5af5d Merge: d013e387e8ca662abf3e6d65495fbe42c2924162 2e48d14e570971d18bc84e0dd186cb6bc07d1616 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Nov 26 15:38:51 2010 +0100 Merge remote branch 'pootle/master' commit d013e387e8ca662abf3e6d65495fbe42c2924162 Merge: 87fa9bd524efe78c45d79f05ccec83612e03c9e4 1486abddef7f4e5e317b4a27fee01849d7b429b0 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Nov 26 15:38:51 2010 +0100 Merge branch 'QA_3_4' commit 2e48d14e570971d18bc84e0dd186cb6bc07d1616 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Fri Nov 26 15:56:31 2010 +0200 Translation update done using Pootle. commit d4a2f92120c827e2c279b9041293c60f4dce9826 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Fri Nov 26 15:56:17 2010 +0200 Translation update done using Pootle. commit 5d2af71bc64de8035b27a4bad16aeddccc36830f Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Fri Nov 26 15:55:31 2010 +0200 Translation update done using Pootle. commit bf88b504bbebd1248d4917477394bf664b569f8e Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Fri Nov 26 15:55:24 2010 +0200 Translation update done using Pootle. commit 610d2e1610b3dd4ce966f3b75df860b4ac77d2c7 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Fri Nov 26 15:55:01 2010 +0200 Translation update done using Pootle. commit 2b66c0e1659a06e8d06f6ae45d10d065a035803a Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Fri Nov 26 15:54:52 2010 +0200 Translation update done using Pootle. commit dfb33f36a0c18426091129f26fdef33d1d11a8c1 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Fri Nov 26 15:54:32 2010 +0200 Translation update done using Pootle. commit 39cb896a5b16759417eedc36dc268839d97f60bf Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Fri Nov 26 15:54:14 2010 +0200 Translation update done using Pootle. commit cc77728e09964d40b0d78c0284a9fb2e1ce3f68d Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Fri Nov 26 15:53:54 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/el.po | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/po/el.po b/po/el.po index 07fd764..ec11275 100644 --- a/po/el.po +++ b/po/el.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-20 07:34-0500\n" -"PO-Revision-Date: 2010-11-26 15:53+0200\n" +"PO-Revision-Date: 2010-11-26 15:56+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" "Language: el\n" @@ -5555,16 +5555,14 @@ msgstr "" "τους δίδεται ο επόμενος αύξων αριθμός." #: libraries/export/csv.php:21 libraries/import/csv.php:27 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns separated with:" -msgstr "Γραμμές που τελειώνουν σε" +msgstr "Στήλες που χωρίζονται με" #: libraries/export/csv.php:22 libraries/import/csv.php:28 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed with:" -msgstr "Πεδία που περικλείονται σε" +msgstr "Στήλες που περικλείονται με" #: libraries/export/csv.php:23 libraries/import/csv.php:29 #| msgid "Fields escaped by" @@ -5572,28 +5570,24 @@ msgid "Columns escaped with:" msgstr "Τα πεδία χρησιμοποιούν το χαρακτήρα διαφυγής: " #: libraries/export/csv.php:24 libraries/import/csv.php:30 -#, fuzzy #| msgid "Lines terminated by" msgid "Lines terminated with:" -msgstr "Γραμμές που τελειώνουν σε" +msgstr "Γραμμές που τελειώνουν με" #: libraries/export/csv.php:25 libraries/export/excel.php:22 #: libraries/export/htmlword.php:28 libraries/export/latex.php:79 #: libraries/export/ods.php:23 libraries/export/odt.php:59 #: libraries/export/xls.php:23 libraries/export/xlsx.php:23 -#, fuzzy #| msgid "Replace NULL by" msgid "Replace NULL with:" msgstr "Αντικατάσταση τιμής NULL με" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove carriage return/line feed characters within columns" -msgstr "Απομάκρυνση χαρακτήρων CRLF μέσα στα πεδία" +msgstr "Απομάκρυνση χαρακτήρων CRLF μέσα στις στήλες" #: libraries/export/excel.php:32 -#, fuzzy #| msgid "Excel edition" msgid "Excel edition:" msgstr "Έκδοση Excel" @@ -5601,10 +5595,9 @@ msgstr "Έκδοση Excel" #: libraries/export/htmlword.php:27 libraries/export/latex.php:69 #: libraries/export/odt.php:55 libraries/export/sql.php:132 #: libraries/export/texytext.php:25 libraries/export/xml.php:45 -#, fuzzy #| msgid "Databases display options" msgid "Data dump options" -msgstr "Επιλογές προβολής βάσεων δεδομένων" +msgstr "Επιλογές απορριμμάτων δεδομένων" #: libraries/export/htmlword.php:135 libraries/export/odt.php:175 #: libraries/export/sql.php:946 libraries/export/texytext.php:123 @@ -5617,10 +5610,9 @@ msgid "Table structure for table" msgstr "Δομή Πίνακα για τον Πίνακα" #: libraries/export/latex.php:13 -#, fuzzy #| msgid "Content of table __TABLE__" msgid "Content of table @TABLE@" -msgstr "Περιεχόμενο του πίνακα __TABLE__" +msgstr "Περιεχόμενο του πίνακα @TABLE@" #: libraries/export/latex.php:14 msgid "(continued)" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0ALPHA1-547-g1486abd
by Michal Čihař 26 Nov '10

26 Nov '10

The branch, QA_3_4 has been updated via 1486abddef7f4e5e317b4a27fee01849d7b429b0 (commit) via 1aff32ac2c5a1f91ce6656970136d34966ca0e4c (commit) via de139609e8fc30aafe15833716e2398d1ef3907d (commit) via 349180ef97641bcf84cfd140b4e3100ad5830942 (commit) via 17ee6f349c33bb2d096d48c1b9bda4f3d47133c0 (commit) via 7b5bfe2478c4e4627e3bd392cb03b07de57945ac (commit) via e13e48bd858c413d495ec626741161ee4b6ede9c (commit) via c490c396043f83431e9250287f7b3ecfee580ff8 (commit) via 8e515b1686587dd4ccc1a03a0c74abeea572ee14 (commit) via 36d5c50947c811064303976723604d6eae9e8b94 (commit) via 3f12de1746a25fe8f34d5892c21ae899356483be (commit) via 3f95ef5c20691037ec7c6dac06df3a8ded53523e (commit) from 968a8d2ad72a831a3447b3e9785da21878ee7fed (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: po/el.po | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/po/el.po b/po/el.po index 07fd764..ec11275 100644 --- a/po/el.po +++ b/po/el.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-20 07:34-0500\n" -"PO-Revision-Date: 2010-11-26 15:53+0200\n" +"PO-Revision-Date: 2010-11-26 15:56+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" "Language: el\n" @@ -5555,16 +5555,14 @@ msgstr "" "τους δίδεται ο επόμενος αύξων αριθμός." #: libraries/export/csv.php:21 libraries/import/csv.php:27 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns separated with:" -msgstr "Γραμμές που τελειώνουν σε" +msgstr "Στήλες που χωρίζονται με" #: libraries/export/csv.php:22 libraries/import/csv.php:28 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed with:" -msgstr "Πεδία που περικλείονται σε" +msgstr "Στήλες που περικλείονται με" #: libraries/export/csv.php:23 libraries/import/csv.php:29 #| msgid "Fields escaped by" @@ -5572,28 +5570,24 @@ msgid "Columns escaped with:" msgstr "Τα πεδία χρησιμοποιούν το χαρακτήρα διαφυγής: " #: libraries/export/csv.php:24 libraries/import/csv.php:30 -#, fuzzy #| msgid "Lines terminated by" msgid "Lines terminated with:" -msgstr "Γραμμές που τελειώνουν σε" +msgstr "Γραμμές που τελειώνουν με" #: libraries/export/csv.php:25 libraries/export/excel.php:22 #: libraries/export/htmlword.php:28 libraries/export/latex.php:79 #: libraries/export/ods.php:23 libraries/export/odt.php:59 #: libraries/export/xls.php:23 libraries/export/xlsx.php:23 -#, fuzzy #| msgid "Replace NULL by" msgid "Replace NULL with:" msgstr "Αντικατάσταση τιμής NULL με" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove carriage return/line feed characters within columns" -msgstr "Απομάκρυνση χαρακτήρων CRLF μέσα στα πεδία" +msgstr "Απομάκρυνση χαρακτήρων CRLF μέσα στις στήλες" #: libraries/export/excel.php:32 -#, fuzzy #| msgid "Excel edition" msgid "Excel edition:" msgstr "Έκδοση Excel" @@ -5601,10 +5595,9 @@ msgstr "Έκδοση Excel" #: libraries/export/htmlword.php:27 libraries/export/latex.php:69 #: libraries/export/odt.php:55 libraries/export/sql.php:132 #: libraries/export/texytext.php:25 libraries/export/xml.php:45 -#, fuzzy #| msgid "Databases display options" msgid "Data dump options" -msgstr "Επιλογές προβολής βάσεων δεδομένων" +msgstr "Επιλογές απορριμμάτων δεδομένων" #: libraries/export/htmlword.php:135 libraries/export/odt.php:175 #: libraries/export/sql.php:946 libraries/export/texytext.php:123 @@ -5617,10 +5610,9 @@ msgid "Table structure for table" msgstr "Δομή Πίνακα για τον Πίνακα" #: libraries/export/latex.php:13 -#, fuzzy #| msgid "Content of table __TABLE__" msgid "Content of table @TABLE@" -msgstr "Περιεχόμενο του πίνακα __TABLE__" +msgstr "Περιεχόμενο του πίνακα @TABLE@" #: libraries/export/latex.php:14 msgid "(continued)" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0ALPHA1-530-g1aff32a
by Michal Čihař 26 Nov '10

26 Nov '10

The branch, MAINT_3_4_0 has been updated via 1aff32ac2c5a1f91ce6656970136d34966ca0e4c (commit) via de139609e8fc30aafe15833716e2398d1ef3907d (commit) via 349180ef97641bcf84cfd140b4e3100ad5830942 (commit) via 17ee6f349c33bb2d096d48c1b9bda4f3d47133c0 (commit) via 7b5bfe2478c4e4627e3bd392cb03b07de57945ac (commit) via e13e48bd858c413d495ec626741161ee4b6ede9c (commit) via c490c396043f83431e9250287f7b3ecfee580ff8 (commit) via 8e515b1686587dd4ccc1a03a0c74abeea572ee14 (commit) via 36d5c50947c811064303976723604d6eae9e8b94 (commit) from 3f12de1746a25fe8f34d5892c21ae899356483be (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: po/el.po | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/po/el.po b/po/el.po index 07fd764..ec11275 100644 --- a/po/el.po +++ b/po/el.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-20 07:34-0500\n" -"PO-Revision-Date: 2010-11-26 15:53+0200\n" +"PO-Revision-Date: 2010-11-26 15:56+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" "Language: el\n" @@ -5555,16 +5555,14 @@ msgstr "" "τους δίδεται ο επόμενος αύξων αριθμός." #: libraries/export/csv.php:21 libraries/import/csv.php:27 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns separated with:" -msgstr "Γραμμές που τελειώνουν σε" +msgstr "Στήλες που χωρίζονται με" #: libraries/export/csv.php:22 libraries/import/csv.php:28 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed with:" -msgstr "Πεδία που περικλείονται σε" +msgstr "Στήλες που περικλείονται με" #: libraries/export/csv.php:23 libraries/import/csv.php:29 #| msgid "Fields escaped by" @@ -5572,28 +5570,24 @@ msgid "Columns escaped with:" msgstr "Τα πεδία χρησιμοποιούν το χαρακτήρα διαφυγής: " #: libraries/export/csv.php:24 libraries/import/csv.php:30 -#, fuzzy #| msgid "Lines terminated by" msgid "Lines terminated with:" -msgstr "Γραμμές που τελειώνουν σε" +msgstr "Γραμμές που τελειώνουν με" #: libraries/export/csv.php:25 libraries/export/excel.php:22 #: libraries/export/htmlword.php:28 libraries/export/latex.php:79 #: libraries/export/ods.php:23 libraries/export/odt.php:59 #: libraries/export/xls.php:23 libraries/export/xlsx.php:23 -#, fuzzy #| msgid "Replace NULL by" msgid "Replace NULL with:" msgstr "Αντικατάσταση τιμής NULL με" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove carriage return/line feed characters within columns" -msgstr "Απομάκρυνση χαρακτήρων CRLF μέσα στα πεδία" +msgstr "Απομάκρυνση χαρακτήρων CRLF μέσα στις στήλες" #: libraries/export/excel.php:32 -#, fuzzy #| msgid "Excel edition" msgid "Excel edition:" msgstr "Έκδοση Excel" @@ -5601,10 +5595,9 @@ msgstr "Έκδοση Excel" #: libraries/export/htmlword.php:27 libraries/export/latex.php:69 #: libraries/export/odt.php:55 libraries/export/sql.php:132 #: libraries/export/texytext.php:25 libraries/export/xml.php:45 -#, fuzzy #| msgid "Databases display options" msgid "Data dump options" -msgstr "Επιλογές προβολής βάσεων δεδομένων" +msgstr "Επιλογές απορριμμάτων δεδομένων" #: libraries/export/htmlword.php:135 libraries/export/odt.php:175 #: libraries/export/sql.php:946 libraries/export/texytext.php:123 @@ -5617,10 +5610,9 @@ msgid "Table structure for table" msgstr "Δομή Πίνακα για τον Πίνακα" #: libraries/export/latex.php:13 -#, fuzzy #| msgid "Content of table __TABLE__" msgid "Content of table @TABLE@" -msgstr "Περιεχόμενο του πίνακα __TABLE__" +msgstr "Περιεχόμενο του πίνακα @TABLE@" #: libraries/export/latex.php:14 msgid "(continued)" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_8, updated. RELEASE_3_3_8-3-gfcc0499
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, MAINT_3_3_8 has been updated via fcc04991533333d18c86b3005967da2d75a56fb9 (commit) from 38547bea51e3ee1b84564dc111c64cc476d2e73c (commit) - Log ----------------------------------------------------------------- commit fcc04991533333d18c86b3005967da2d75a56fb9 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 09:20:07 2010 -0500 3.3.8.1 release ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation.html b/Documentation.html index a233ccd..bf30068 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.8 - Documentation</title> + <title>phpMyAdmin 3.3.8.1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.8 + 3.3.8.1 Documentation </h1> </div> diff --git a/README b/README index 967acde..d84e8d7 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.8 - ------------- + Version 3.3.8.1 + --------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 6594e3a..8f5c43d 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.8'); + $this->set('PMA_VERSION', '3.3.8.1'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 598e218..f390397 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.8 - Official translators</title> + <title>phpMyAdmin 3.3.8.1 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.8 + 3.3.8.1 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_2_11_11, updated. RELEASE_2_11_11-3-ga6e7939
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, MAINT_2_11_11 has been updated via a6e79391b92a48ffef307fa107ce1a61965e4244 (commit) from 21f624a26574fd45c043ddd27bf5a190b80c2757 (commit) - Log ----------------------------------------------------------------- commit a6e79391b92a48ffef307fa107ce1a61965e4244 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 09:17:30 2010 -0500 2.11.11.1 release ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation.html b/Documentation.html index 5513e18..a3f7982 100644 --- a/Documentation.html +++ b/Documentation.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>phpMyAdmin 2.11.11 - Documentation</title> + <title>phpMyAdmin 2.11.11.1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -33,7 +33,7 @@ <li><a href="#glossary">Glossary</a></li> </ul> -<h1>phpMyAdmin 2.11.11 Documentation</h1> +<h1>phpMyAdmin 2.11.11.1 Documentation</h1> <ul><li><a href="http://www.phpmyadmin.net/"> phpMyAdmin homepage</a></li> diff --git a/README b/README index 375317e..a1dfb54 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 2.11.11 - --------------- + Version 2.11.11.1 + ----------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index a2cf481..f1df2e0 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -85,7 +85,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '2.11.11'); + $this->set('PMA_VERSION', '2.11.11.1'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 88148b9..f59ca41 100644 --- a/translators.html +++ b/translators.html @@ -8,7 +8,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>phpMyAdmin 2.11.11 - Official translators</title> + <title>phpMyAdmin 2.11.11.1 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -31,7 +31,7 @@ <li><a href="Documentation.html#glossary">Glossary</a></li> </ul> -<h1>phpMyAdmin 2.11.11 official translators list</h1> +<h1>phpMyAdmin 2.11.11.1 official translators list</h1> <p> Here is the list of the "official translators" of phpMyAdmin.</p> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA1-1099-g87fa9bd
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, master has been updated via 87fa9bd524efe78c45d79f05ccec83612e03c9e4 (commit) via 6d3b66059afe25da2bb1df00bdac76829f2f940d (commit) from e356354c44323407dc5c2626117b1aa924365049 (commit) - Log ----------------------------------------------------------------- commit 87fa9bd524efe78c45d79f05ccec83612e03c9e4 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 09:03:22 2010 -0500 ChangeLog for XSS fix commit 6d3b66059afe25da2bb1df00bdac76829f2f940d Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Nov 25 11:50:50 2010 +0100 bug #3115519: fixed XSS on search ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++--- libraries/common.lib.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19b3110..f01a96b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -132,6 +132,9 @@ - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc +3.3.8.1 (2010-10-26) +- bug #3115519 (private) [security] XSS on db search + 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 @@ -145,9 +148,6 @@ 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after a page size increase, thanks to Martin Schönberger - mad05 -- bug #3054458 [core] Fixed displaying number of rows. -- bug #3035300 [parser] Fixed wrong definition of keywords. -- [setup] Fixed escaping of server name. 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ec5100f..4b194de 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1769,7 +1769,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $tmp = $tag_params; $tag_params = array(); if (!empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, \'' . $tmp . '\')'; + $tag_params['onclick'] = 'return confirmLink(this, \'' . PMA_escapeJsString($tmp) . '\')'; } unset($tmp); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0ALPHA1-535-g968a8d2
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, QA_3_4 has been updated via 968a8d2ad72a831a3447b3e9785da21878ee7fed (commit) via e90aebf71be2fd26e464e6d33f753ce925eb6ff4 (commit) from 9ea69bd18ef73f761624d3daa2824e3a6cd1c8cc (commit) - Log ----------------------------------------------------------------- commit 968a8d2ad72a831a3447b3e9785da21878ee7fed Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 09:03:22 2010 -0500 ChangeLog for XSS fix commit e90aebf71be2fd26e464e6d33f753ce925eb6ff4 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Nov 25 11:50:50 2010 +0100 bug #3115519: fixed XSS on search ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++--- libraries/common.lib.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a027c0..c120c04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -132,6 +132,9 @@ - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc +3.3.8.1 (2010-10-26) +- bug #3115519 (private) [security] XSS on db search + 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 @@ -145,9 +148,6 @@ 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after a page size increase, thanks to Martin Schönberger - mad05 -- bug #3054458 [core] Fixed displaying number of rows. -- bug #3035300 [parser] Fixed wrong definition of keywords. -- [setup] Fixed escaping of server name. 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ec5100f..4b194de 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1769,7 +1769,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $tmp = $tag_params; $tag_params = array(); if (!empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, \'' . $tmp . '\')'; + $tag_params['onclick'] = 'return confirmLink(this, \'' . PMA_escapeJsString($tmp) . '\')'; } unset($tmp); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_8-19-gb1103e2
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, QA_3_3 has been updated via b1103e2db99405d032a230ed50f0b88b799605a3 (commit) via f805097b86fabd3d4c8dff1f2324efdae1ca0d70 (commit) from d6a7bd40faa240c23016ce482c36650294faa13e (commit) - Log ----------------------------------------------------------------- commit b1103e2db99405d032a230ed50f0b88b799605a3 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 09:07:19 2010 -0500 fix merge conflicts commit f805097b86fabd3d4c8dff1f2324efdae1ca0d70 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Nov 25 11:50:50 2010 +0100 bug #3115519: fixed XSS on search ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++--- libraries/common.lib.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65fed96..41c784f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,9 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc +3.3.8.1 (2010-10-26) +- bug #3115519 (private) [security] XSS on db search + 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 @@ -27,9 +30,6 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after a page size increase, thanks to Martin Schönberger - mad05 -- bug #3054458 [core] Fixed displaying number of rows. -- bug #3035300 [parser] Fixed wrong definition of keywords. -- [setup] Fixed escaping of server name. 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 610438c..b926e92 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1634,7 +1634,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $tmp = $tag_params; $tag_params = array(); if (!empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, \'' . $tmp . '\')'; + $tag_params['onclick'] = 'return confirmLink(this, \'' . PMA_escapeJsString($tmp) . '\')'; } unset($tmp); } hooks/post-receive -- phpMyAdmin

1 0