Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: f5393eff61f07305f8993ed129b3a12fbac06eff
https://github.com/phpmyadmin/phpmyadmin/commit/f5393eff61f07305f8993ed129b…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Changed paths:
M libraries/common.inc.php
M libraries/plugins/auth/AuthenticationHttp.php
M libraries/plugins/auth/AuthenticationSignon.php
M tbl_change.php
Log Message:
-----------
Remove code mentioning register_globals
This was removed in PHP 5.4.0 so we really do not have to care anymore.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 3bda9a03b9e1a90224b61ae3f67ce92ba7995a24
https://github.com/phpmyadmin/phpmyadmin/commit/3bda9a03b9e1a90224b61ae3f67…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Changed paths:
M export.php
M libraries/Encoding.php
M libraries/common.inc.php
M libraries/display_export.lib.php
M libraries/display_import.lib.php
M libraries/export.lib.php
R libraries/kanji-encoding.lib.php
M libraries/sql_query_form.lib.php
M test/classes/EncodingTest.php
R test/libraries/PMA_kanji-encoding_test.php
M test/libraries/PMA_sql_query_form_test.php
Log Message:
-----------
Move Kanji encoding handling to Encoding class
Issue #11731
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: c690f60f503c06d52b2bf32d51e6a85fef33fa5c
https://github.com/phpmyadmin/phpmyadmin/commit/c690f60f503c06d52b2bf32d51e…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Changed paths:
M po/ko.po
Log Message:
-----------
Translated using Weblate (Korean)
Currently translated at 78.0% (2505 of 3211 strings)
[CI skip]
Commit: c8422b970063fae93e189e8b12758261f47ead1e
https://github.com/phpmyadmin/phpmyadmin/commit/c8422b970063fae93e189e8b127…
Author: Weblate <noreply(a)weblate.org>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Changed paths:
M ChangeLog
M libraries/DisplayResults.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 07710e9aef5bf5890ddd8e0ebf5e9f907e787c12
https://github.com/phpmyadmin/phpmyadmin/commit/07710e9aef5bf5890ddd8e0ebf5…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Log Message:
-----------
Merge branch 'QA_4_6'
Commit: 4ed47fc4b4f335849f66f026c57ce9364e225c30
https://github.com/phpmyadmin/phpmyadmin/commit/4ed47fc4b4f335849f66f026c57…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Changed paths:
M export.php
A libraries/Encoding.php
R libraries/charset_conversion.lib.php
M libraries/common.inc.php
M libraries/export.lib.php
R libraries/iconv_wrapper.lib.php
M libraries/import.lib.php
A test/classes/EncodingTest.php
M test/classes/plugin/export/ExportSqlTest.php
R test/libraries/PMA_charset_conversion_test.php
M test/libraries/PMA_display_export_test.php
R test/libraries/PMA_iconv_wrapper_test.php
M test/libraries/database_interface_test.php
Log Message:
-----------
Move charset conversion to a class
Also removes ancient support for AIX iconv.
Issue #11731
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1b9ea10f11e1...4ed47fc4b4f3
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 1b9ea10f11e1c30a0a50d679328db8c30e2186f9
https://github.com/phpmyadmin/phpmyadmin/commit/1b9ea10f11e1c30a0a50d679328…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Changed paths:
M libraries/DatabaseInterface.php
A libraries/Logging.php
M libraries/common.inc.php
R libraries/logging.lib.php
Log Message:
-----------
Move logging helpers to class
Issue #11731
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: ff743830ff439664d0db33ea3ca0552caed7b32b
https://github.com/phpmyadmin/phpmyadmin/commit/ff743830ff439664d0db33ea3ca…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Changed paths:
M ChangeLog
M libraries/DisplayResults.php
Log Message:
-----------
Fix #12073 Hide edit and delete buttons when the results are not related to a table
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: e04585df5b5fb4afe92ca62cf25f5fcd477083d6
https://github.com/phpmyadmin/phpmyadmin/commit/e04585df5b5fb4afe92ca62cf25…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Changed paths:
M ChangeLog
M libraries/sql-parser/src/Components/Condition.php
M libraries/sql-parser/src/Components/Expression.php
M libraries/sql-parser/src/Statements/DropStatement.php
M libraries/sql-parser/src/Utils/BufferedQuery.php
Log Message:
-----------
Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6
Conflicts:
ChangeLog
Commit: 84deb574d3ac5d40bc4b37dc2597a00c518164ba
https://github.com/phpmyadmin/phpmyadmin/commit/84deb574d3ac5d40bc4b37dc259…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Changed paths:
M ChangeLog
M libraries/DisplayResults.php
Log Message:
-----------
Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/07e4ab1fc31b...84deb574d3ac