Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 89434fb7e1c588cab7e437d596a2a408239047de
https://github.com/phpmyadmin/phpmyadmin/commit/89434fb7e1c588cab7e437d596a…
Author: Robert Antoni Buj Gelonch <robert.buj(a)gmail.com>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M po/ca.po
Log Message:
-----------
Translated using Weblate (Catalan)
Currently translated at 97.1% (3194 of 3287 strings)
[CI skip]
Commit: 06e2265a418e208e932c236d253579f15a5d243b
https://github.com/phpmyadmin/phpmyadmin/commit/06e2265a418e208e932c236d253…
Author: Weblate <noreply(a)weblate.org>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M composer.json
A test/selenium/ChangePasswordTest.php
A test/selenium/CreateDropDatabaseTest.php
A test/selenium/CreateRemoveUserTest.php
A test/selenium/DbEventsTest.php
A test/selenium/DbOperationsTest.php
A test/selenium/DbProceduresTest.php
A test/selenium/DbStructureTest.php
A test/selenium/DbTriggersTest.php
A test/selenium/ExportTest.php
A test/selenium/ImportTest.php
A test/selenium/LoginTest.php
A test/selenium/NormalizationTest.php
R test/selenium/PmaSeleniumChangePasswordTest.php
R test/selenium/PmaSeleniumCreateDropDatabaseTest.php
R test/selenium/PmaSeleniumCreateRemoveUserTest.php
R test/selenium/PmaSeleniumDbEventsTest.php
R test/selenium/PmaSeleniumDbOperationsTest.php
R test/selenium/PmaSeleniumDbProceduresTest.php
R test/selenium/PmaSeleniumDbStructureTest.php
R test/selenium/PmaSeleniumDbTriggersTest.php
R test/selenium/PmaSeleniumExportTest.php
R test/selenium/PmaSeleniumImportTest.php
R test/selenium/PmaSeleniumLoginTest.php
R test/selenium/PmaSeleniumNormalizationTest.php
R test/selenium/PmaSeleniumQueryByExampleTest.php
R test/selenium/PmaSeleniumServerSettingsTest.php
R test/selenium/PmaSeleniumSqlQueryTest.php
R test/selenium/PmaSeleniumTableBrowseTest.php
R test/selenium/PmaSeleniumTableCreateTest.php
R test/selenium/PmaSeleniumTableInsertTest.php
R test/selenium/PmaSeleniumTableOperationsTest.php
R test/selenium/PmaSeleniumTableStructureTest.php
R test/selenium/PmaSeleniumTrackingTest.php
R test/selenium/PmaSeleniumXssTest.php
A test/selenium/QueryByExampleTest.php
A test/selenium/ServerSettingsTest.php
A test/selenium/SqlQueryTest.php
A test/selenium/TableBrowseTest.php
A test/selenium/TableCreateTest.php
A test/selenium/TableInsertTest.php
A test/selenium/TableOperationsTest.php
A test/selenium/TableStructureTest.php
M test/selenium/TestBase.php
A test/selenium/TrackingTest.php
A test/selenium/XssTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1957af5663bd...06e2265a418e
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 44df4a309475479af404506dbd77588acc424637
https://github.com/phpmyadmin/phpmyadmin/commit/44df4a309475479af404506dbd7…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M libraries/Util.php
M test/classes/DisplayResultsTest.php
Log Message:
-----------
Force using POST for SQL query in Util::linkOrButton
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 32ed68f30911cf199d9c19ac6d971fcddfd57c0a
https://github.com/phpmyadmin/phpmyadmin/commit/32ed68f30911cf199d9c19ac6d9…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Log Message:
-----------
Merge branch 'QA_4_7'
Commit: 9b820d84d1f6cb55d33fa5ec6f1a341cdf2032d2
https://github.com/phpmyadmin/phpmyadmin/commit/9b820d84d1f6cb55d33fa5ec6f1…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M po/ca.po
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Commit: 8b8e68c6bf3867a7ccfc794326abf1bdcc8dbaa9
https://github.com/phpmyadmin/phpmyadmin/commit/8b8e68c6bf3867a7ccfc794326a…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M composer.json
M test/selenium/PmaSeleniumChangePasswordTest.php
M test/selenium/PmaSeleniumCreateDropDatabaseTest.php
M test/selenium/PmaSeleniumCreateRemoveUserTest.php
M test/selenium/PmaSeleniumDbEventsTest.php
M test/selenium/PmaSeleniumDbOperationsTest.php
M test/selenium/PmaSeleniumDbProceduresTest.php
M test/selenium/PmaSeleniumDbStructureTest.php
M test/selenium/PmaSeleniumDbTriggersTest.php
M test/selenium/PmaSeleniumExportTest.php
M test/selenium/PmaSeleniumImportTest.php
M test/selenium/PmaSeleniumLoginTest.php
M test/selenium/PmaSeleniumNormalizationTest.php
M test/selenium/PmaSeleniumQueryByExampleTest.php
M test/selenium/PmaSeleniumServerSettingsTest.php
M test/selenium/PmaSeleniumSqlQueryTest.php
M test/selenium/PmaSeleniumTableBrowseTest.php
M test/selenium/PmaSeleniumTableCreateTest.php
M test/selenium/PmaSeleniumTableInsertTest.php
M test/selenium/PmaSeleniumTableOperationsTest.php
M test/selenium/PmaSeleniumTableStructureTest.php
A test/selenium/PmaSeleniumTestBase.php
M test/selenium/PmaSeleniumTrackingTest.php
M test/selenium/PmaSeleniumXssTest.php
R test/selenium/TestBase.php
Log Message:
-----------
Use PSR-4 for loading selenium tests and adjust their names
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 1957af5663bdc5d3745b327e6ed3310760f95bb8
https://github.com/phpmyadmin/phpmyadmin/commit/1957af5663bdc5d3745b327e6ed…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
A test/selenium/ChangePasswordTest.php
A test/selenium/CreateDropDatabaseTest.php
A test/selenium/CreateRemoveUserTest.php
A test/selenium/DbEventsTest.php
A test/selenium/DbOperationsTest.php
A test/selenium/DbProceduresTest.php
A test/selenium/DbStructureTest.php
A test/selenium/DbTriggersTest.php
A test/selenium/ExportTest.php
A test/selenium/ImportTest.php
A test/selenium/LoginTest.php
A test/selenium/NormalizationTest.php
R test/selenium/PmaSeleniumChangePasswordTest.php
R test/selenium/PmaSeleniumCreateDropDatabaseTest.php
R test/selenium/PmaSeleniumCreateRemoveUserTest.php
R test/selenium/PmaSeleniumDbEventsTest.php
R test/selenium/PmaSeleniumDbOperationsTest.php
R test/selenium/PmaSeleniumDbProceduresTest.php
R test/selenium/PmaSeleniumDbStructureTest.php
R test/selenium/PmaSeleniumDbTriggersTest.php
R test/selenium/PmaSeleniumExportTest.php
R test/selenium/PmaSeleniumImportTest.php
R test/selenium/PmaSeleniumLoginTest.php
R test/selenium/PmaSeleniumNormalizationTest.php
R test/selenium/PmaSeleniumQueryByExampleTest.php
R test/selenium/PmaSeleniumServerSettingsTest.php
R test/selenium/PmaSeleniumSqlQueryTest.php
R test/selenium/PmaSeleniumTableBrowseTest.php
R test/selenium/PmaSeleniumTableCreateTest.php
R test/selenium/PmaSeleniumTableInsertTest.php
R test/selenium/PmaSeleniumTableOperationsTest.php
R test/selenium/PmaSeleniumTableStructureTest.php
R test/selenium/PmaSeleniumTestBase.php
R test/selenium/PmaSeleniumTrackingTest.php
R test/selenium/PmaSeleniumXssTest.php
A test/selenium/QueryByExampleTest.php
A test/selenium/ServerSettingsTest.php
A test/selenium/SqlQueryTest.php
A test/selenium/TableBrowseTest.php
A test/selenium/TableCreateTest.php
A test/selenium/TableInsertTest.php
A test/selenium/TableOperationsTest.php
A test/selenium/TableStructureTest.php
A test/selenium/TestBase.php
A test/selenium/TrackingTest.php
A test/selenium/XssTest.php
Log Message:
-----------
Remove PmaSelenium prefix from Selenium tests
It is good enough to have Selenium in the namespace.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1bc1e3c2c7ef...1957af5663bd
Branch: refs/heads/QA_4_7
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 44df4a309475479af404506dbd77588acc424637
https://github.com/phpmyadmin/phpmyadmin/commit/44df4a309475479af404506dbd7…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M libraries/Util.php
M test/classes/DisplayResultsTest.php
Log Message:
-----------
Force using POST for SQL query in Util::linkOrButton
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 0a1634a12bbcdf3f7147b5fd44ae4fbcace53d57
https://github.com/phpmyadmin/phpmyadmin/commit/0a1634a12bbcdf3f7147b5fd44a…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-12-18 (Mon, 18 Dec 2017)
Changed paths:
M libraries/classes/Plugins/Auth/AuthenticationCookie.php
M libraries/common.inc.php
Log Message:
-----------
Warn user in case the failed login is result of failed setting of cookie
This can easily happen when switching between HTTPS and HTTP - once you
login using HTTPS, the secure cookie is created and it can not be
overwritten by non secure one created on HTTP connection making the
browser stuck on wrong session ID.
Issue #13872
Signed-off-by: Michal Čihař <michal(a)cihar.com>