Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 4e7077b264cebb0b841b63f4e13974ab10a1a3bb
https://github.com/phpmyadmin/phpmyadmin/commit/4e7077b264cebb0b841b63f4e13…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-05-25 (Wed, 25 May 2016)
Changed paths:
M test/ci-selenium
Log Message:
-----------
Run selenium tests more verbosely to see the progress
The currently timeout od Travis due to no output.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 6d4bd777457ce7d24647cedc0360052a6bde9c21
https://github.com/phpmyadmin/phpmyadmin/commit/6d4bd777457ce7d24647cedc036…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-05-23 (Mon, 23 May 2016)
Changed paths:
M import.php
M libraries/bookmark.lib.php
M libraries/sql.lib.php
Log Message:
-----------
Avoid not needed urlencode/urldecode for bookmarked SQL query
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: b061096abd992801fbbd805ef6ff74e627528780
https://github.com/phpmyadmin/phpmyadmin/commit/b061096abd992801fbbd805ef6f…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-05-23 (Mon, 23 May 2016)
Changed paths:
M libraries/DisplayResults.php
M libraries/mult_submits.lib.php
M tbl_row_action.php
Log Message:
-----------
Avoid not neeedded urlencode/urldecode steps in multi submits
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 5bb7349e0d4d7d3a8e238f9a529cca981a27c270
https://github.com/phpmyadmin/phpmyadmin/commit/5bb7349e0d4d7d3a8e238f9a529…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-05-23 (Mon, 23 May 2016)
Changed paths:
M import.php
M libraries/Bookmark.php
M libraries/DisplayResults.php
M libraries/mult_submits.lib.php
M libraries/sql.lib.php
M tbl_row_action.php
Log Message:
-----------
Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/49a1db045e4f...5bb7349e0d4d
Branch: refs/heads/QA_4_6
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 24bb12793d1b09cdb1bf24dcb4f6a860fd3b2f2a
https://github.com/phpmyadmin/phpmyadmin/commit/24bb12793d1b09cdb1bf24dcb4f…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-05-23 (Mon, 23 May 2016)
Changed paths:
M ChangeLog
M libraries/common.inc.php
Log Message:
-----------
Fix locking issues when importing SQL
When running import (or generally any SQL query), some tables might be
locked. This will cause queries to not locked tables to fail. And this
is exacly what we do with control user link.
So let's have separate link for control queries even if we're using same
credentials as for main link.
Fixes #12219
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: cde00cf5ffaa2f8853c513606da457b4cf87b79c
https://github.com/phpmyadmin/phpmyadmin/commit/cde00cf5ffaa2f8853c513606da…
Author: Daniel Linjama <daniel(a)linjama.com>
Date: 2016-05-21 (Sat, 21 May 2016)
Changed paths:
M po/fi.po
Log Message:
-----------
Translated using Weblate (Finnish)
Currently translated at 67.7% (2176 of 3211 strings)
[CI skip]
Commit: ef1c06fa9939bbbbbe2fc0313cb89d13bd687200
https://github.com/phpmyadmin/phpmyadmin/commit/ef1c06fa9939bbbbbe2fc0313cb…
Author: Axel Magnus Gaasø <axel.gaaso(a)gmail.com>
Date: 2016-05-21 (Sat, 21 May 2016)
Changed paths:
M po/nb.po
Log Message:
-----------
Translated using Weblate (Norwegian Bokmål)
Currently translated at 57.9% (1860 of 3211 strings)
[CI skip]
Commit: e8f1a09bb85e6c8d140dfeba985f75877b90aebe
https://github.com/phpmyadmin/phpmyadmin/commit/e8f1a09bb85e6c8d140dfeba985…
Author: Franco <fulanodetal.github1(a)openaliasbox.org>
Date: 2016-05-22 (Sun, 22 May 2016)
Changed paths:
M po/es.po
Log Message:
-----------
Translated using Weblate (Spanish)
Currently translated at 99.5% (3196 of 3211 strings)
[CI skip]
Commit: 24bb12793d1b09cdb1bf24dcb4f6a860fd3b2f2a
https://github.com/phpmyadmin/phpmyadmin/commit/24bb12793d1b09cdb1bf24dcb4f…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-05-23 (Mon, 23 May 2016)
Changed paths:
M ChangeLog
M libraries/common.inc.php
Log Message:
-----------
Fix locking issues when importing SQL
When running import (or generally any SQL query), some tables might be
locked. This will cause queries to not locked tables to fail. And this
is exacly what we do with control user link.
So let's have separate link for control queries even if we're using same
credentials as for main link.
Fixes #12219
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 22f0f4fd12a92326dc3c6ffe45c0e50b6cc70ac6
https://github.com/phpmyadmin/phpmyadmin/commit/22f0f4fd12a92326dc3c6ffe45c…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-05-23 (Mon, 23 May 2016)
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_6'
Commit: 49a1db045e4f3459941b229bf74d37884df27c8a
https://github.com/phpmyadmin/phpmyadmin/commit/49a1db045e4f3459941b229bf74…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-05-23 (Mon, 23 May 2016)
Changed paths:
M ChangeLog
M libraries/common.inc.php
Log Message:
-----------
Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/499be8eca161...49a1db045e4f