Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2bf398a3a8d0627b88398384af246367cc1e00ba https://github.com/phpmyadmin/phpmyadmin/commit/2bf398a3a8d0627b88398384af24... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-10 (Mon, 10 Oct 2016)
Changed paths: M templates/navigation/logo.phtml
Log Message: ----------- Use sprintf instead of directly concatenating the variable
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 7bf85fe817114460de0ad51cf436d1921aef2924 https://github.com/phpmyadmin/phpmyadmin/commit/7bf85fe817114460de0ad51cf436... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-10 (Mon, 10 Oct 2016)
Changed paths: M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php
Log Message: ----------- Use sprintf instead of directly concatenating the variable
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: c1acb3a212872fd235446efa446c3531653a5917 https://github.com/phpmyadmin/phpmyadmin/commit/c1acb3a212872fd235446efa446c... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-11-26 (Sat, 26 Nov 2016)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php
Log Message: ----------- Prepare for 4.6.6-dev
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: 4d26bec55acd47cc2b5298802269284b3d16b374 https://github.com/phpmyadmin/phpmyadmin/commit/4d26bec55acd47cc2b5298802269... Author: Michal Čihař michal@cihar.com Date: 2016-11-28 (Mon, 28 Nov 2016)
Changed paths: M doc/setup.rst
Log Message: ----------- Adjust docs to latest Docker image changes
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 4d0d64872851912f58a312306c9d3cc47a660922 https://github.com/phpmyadmin/phpmyadmin/commit/4d0d64872851912f58a312306c9d... Author: ncwgf hd@cgsword.com Date: 2016-11-28 (Mon, 28 Nov 2016)
Changed paths: M po/zh_TW.po
Log Message: ----------- Translated using Weblate (Chinese (Taiwan))
Currently translated at 99.0% (3192 of 3222 strings)
[CI skip]
Commit: 09bfa5fa9d4cb6f6e99cc7e775227d6273bd5c6c https://github.com/phpmyadmin/phpmyadmin/commit/09bfa5fa9d4cb6f6e99cc7e77522... Author: Marc Delisle marc@infomarc.info Date: 2016-11-28 (Mon, 28 Nov 2016)
Changed paths: M po/fr.po
Log Message: ----------- Translated using Weblate (French)
Currently translated at 100.0% (3222 of 3222 strings)
[CI skip]
Commit: 9c52bd07242e77986533a53c9d2052ae4c0662ac https://github.com/phpmyadmin/phpmyadmin/commit/9c52bd07242e77986533a53c9d20... Author: Weblate noreply@weblate.org Date: 2016-11-28 (Mon, 28 Nov 2016)
Changed paths: M doc/setup.rst
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 10caf5bcae948c687fbd4d64eb5af2641a3c8119 https://github.com/phpmyadmin/phpmyadmin/commit/10caf5bcae948c687fbd4d64eb5a... Author: Michal Čihař michal@cihar.com Date: 2016-11-28 (Mon, 28 Nov 2016)
Changed paths: M libraries/Config.php
Log Message: ----------- Check if variables are set prior to use
Issue #12713
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 826a885a90b2f9628a9c0a1b52f94e2016bbd255 https://github.com/phpmyadmin/phpmyadmin/commit/826a885a90b2f9628a9c0a1b52f9... Author: Michal Čihař michal@cihar.com Date: 2016-11-28 (Mon, 28 Nov 2016)
Changed paths: M libraries/vendor_config.php
Log Message: ----------- Fix comment for sql-parser vendor config
Fixes #12745
Signed-off-by: Michal Čihař michal@cihar.com
Commit: ad55a6eba86d9fdd6e2062fc7644aa1180eac0bd https://github.com/phpmyadmin/phpmyadmin/commit/ad55a6eba86d9fdd6e2062fc7644... Author: Michal Čihař michal@cihar.com Date: 2016-11-28 (Mon, 28 Nov 2016)
Changed paths: M libraries/core.lib.php
Log Message: ----------- Avoid listing demo.phpmyadmin.net twice
Fixes #12744
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 48ebdf1852bae90f0f1431fc7983f591ce540025 https://github.com/phpmyadmin/phpmyadmin/commit/48ebdf1852bae90f0f1431fc7983... Author: Jees K Denny jees.jees5@gmail.com Date: 2016-11-28 (Mon, 28 Nov 2016)
Changed paths: M libraries/Header.php
Log Message: ----------- Add missing end of meta tags in header
Issue #12746
Signed-off-by: Jees K Denny jees.jees5@gmail.com Signed-off-by: Michal Čihař michal@cihar.com
Commit: 068eae7e676fb7f6962036c71074707c13ccf216 https://github.com/phpmyadmin/phpmyadmin/commit/068eae7e676fb7f6962036c71074... Author: Michal Čihař michal@cihar.com Date: 2016-11-28 (Mon, 28 Nov 2016)
Changed paths: M templates/header_location.phtml
Log Message: ----------- Add missing end of tags
Fixes #12746
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 09f56abed65186216858cf30bdb6f3bea01c708f https://github.com/phpmyadmin/phpmyadmin/commit/09f56abed65186216858cf30bdb6... Author: Michal Čihař michal@cihar.com Date: 2016-11-28 (Mon, 28 Nov 2016)
Changed paths: M test/libraries/core/PMA_headerLocation_test.php
Log Message: ----------- Fix test expectations
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 1b1d68293b7cc3c06ddd6a60c2b0c29b3d9ae859 https://github.com/phpmyadmin/phpmyadmin/commit/1b1d68293b7cc3c06ddd6a60c2b0... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Use proper check to verify if index is set in the Request
Fix #12759
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: b1e14110de7d2872569684c78c0a0e76ab14ff24 https://github.com/phpmyadmin/phpmyadmin/commit/b1e14110de7d2872569684c78c0a... Author: pralin itgo1004@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M po/ja.po
Log Message: ----------- Translated using Weblate (Japanese)
Currently translated at 70.7% (2280 of 3222 strings)
[CI skip]
Commit: 2d4c88ab1515e4f3c012a482346880c8f592fea6 https://github.com/phpmyadmin/phpmyadmin/commit/2d4c88ab1515e4f3c012a4823468... Author: Weblate noreply@weblate.org Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M ChangeLog M libraries/server_privileges.lib.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 17e4e9e5c06baa5be5feae72a8d1d844e39f5f02 https://github.com/phpmyadmin/phpmyadmin/commit/17e4e9e5c06baa5be5feae72a8d1... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog for #12759
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 6baa646c74f041f3646017333eb86e414821f034 https://github.com/phpmyadmin/phpmyadmin/commit/6baa646c74f041f3646017333eb8... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Check if the cfgrelation tables are actually set before using them
Fix #12760
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 996f5a591d37d573154952ee928558c5737cf83e https://github.com/phpmyadmin/phpmyadmin/commit/996f5a591d37d573154952ee9285... Author: pralin itgo1004@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M po/ja.po
Log Message: ----------- Translated using Weblate (Japanese)
Currently translated at 70.7% (2280 of 3222 strings)
[CI skip]
Commit: 1ee52c8e4cf65e6cc2bc31ca7d07b291da60b2b8 https://github.com/phpmyadmin/phpmyadmin/commit/1ee52c8e4cf65e6cc2bc31ca7d07... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog for #12760
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 9fdc05ce3818fbab3ef9ba185f000c8d6f57368f https://github.com/phpmyadmin/phpmyadmin/commit/9fdc05ce3818fbab3ef9ba185f00... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M po/ja.po
Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6
Commit: 3990a6c311758db6a67c0b2cb2c2e26034fabf20 https://github.com/phpmyadmin/phpmyadmin/commit/3990a6c311758db6a67c0b2cb2c2... Author: Weblate noreply@weblate.org Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M ChangeLog M libraries/server_privileges.lib.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 3152c1e4c27f44a8c1c460e0be86972b1a95632c https://github.com/phpmyadmin/phpmyadmin/commit/3152c1e4c27f44a8c1c460e0be86... Author: pralin itgo1004@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M po/ja.po
Log Message: ----------- Translated using Weblate (Japanese)
Currently translated at 70.7% (2280 of 3222 strings)
[CI skip]
Commit: 08b176dc5893e988a4170fa18c88377681baf35c https://github.com/phpmyadmin/phpmyadmin/commit/08b176dc5893e988a4170fa18c88... Author: Michal Čihař michal@cihar.com Date: 2016-11-30 (Wed, 30 Nov 2016)
Changed paths: M ChangeLog M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/UtfString.php M libraries/sql-parser/src/Utils/Query.php
Log Message: ----------- Update SQL parser to 3.4.14
- issue #12762 Fixed parsing of SQL with BINARY function
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 00f29c7460e9c4bd085ef35d37971010bcd3d79c https://github.com/phpmyadmin/phpmyadmin/commit/00f29c7460e9c4bd085ef35d3797... Author: Michal Čihař michal@cihar.com Date: 2016-11-30 (Wed, 30 Nov 2016)
Changed paths: M js/functions.js
Log Message: ----------- Escape URL chars in version as well
Not that this happens, but just to be sure.
Fixes #12761
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 2346b8495a8950235762184b0bfc6e7b8145c47d https://github.com/phpmyadmin/phpmyadmin/commit/2346b8495a8950235762184b0bfc... Author: Michal Čihař michal@cihar.com Date: 2016-11-30 (Wed, 30 Nov 2016)
Changed paths: M js/tracekit/tracekit.js
Log Message: ----------- Update tracekit
This should fix occasional permission problems as this is better handled in newer version.
Not tested though as I can not reproduce the original issue.
Fixes #12739
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 05a258778f5ecbdb123581d316e965eb51e17740 https://github.com/phpmyadmin/phpmyadmin/commit/05a258778f5ecbdb123581d316e9... Author: Michal Čihař michal@cihar.com Date: 2016-11-30 (Wed, 30 Nov 2016)
Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.php
Log Message: ----------- ReCaptcha now works without allow_url_fopen
Fixes #12588
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 27bddd66f7a9b58c1a14ed12d441a5e84c6a3444 https://github.com/phpmyadmin/phpmyadmin/commit/27bddd66f7a9b58c1a14ed12d441... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-30 (Wed, 30 Nov 2016)
Changed paths: M ChangeLog
Log Message: ----------- Add ChangeLog entries under appropriate future release
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: bb9a762a965235c83d955d21b609a6938229adcb https://github.com/phpmyadmin/phpmyadmin/commit/bb9a762a965235c83d955d21b609... Author: Michal Čihař michal@cihar.com Date: 2016-12-01 (Thu, 01 Dec 2016)
Changed paths: M ChangeLog
Log Message: ----------- Remove wrong changelog entry
This was not yet fixed.
Issue #12481
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e61b2135da52051bb158c37b9eed35d734bf441c https://github.com/phpmyadmin/phpmyadmin/commit/e61b2135da52051bb158c37b9eed... Author: Michal Čihař michal@cihar.com Date: 2016-12-01 (Thu, 01 Dec 2016)
Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.php
Log Message: ----------- Fixed SQL export with newlines
Remove manual escaping where we do proper escaping through MySQL extension.
Fixes #12765
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 89dd577d2fa26dac844c5a5e74ab10c7985c3167 https://github.com/phpmyadmin/phpmyadmin/commit/89dd577d2fa26dac844c5a5e74ab... Author: Michal Čihař michal@cihar.com Date: 2016-12-01 (Thu, 01 Dec 2016)
Changed paths: M ChangeLog M js/config.js
Log Message: ----------- Show no local storage warning only on settings tab
It really makes no sense to show it on every page when we're checking whether there are settings to import.
Fixes #12699
Signed-off-by: Michal Čihař michal@cihar.com
Commit: a11a6858d19396de70136938ad07f1947d4c4fdb https://github.com/phpmyadmin/phpmyadmin/commit/a11a6858d19396de70136938ad07... Author: Michal Čihař michal@cihar.com Date: 2016-12-01 (Thu, 01 Dec 2016)
Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.php
Log Message: ----------- Merge remote-tracking branch 'origin/pull/12768' into QA_4_6
Commit: 7d4f188c728564687580de0d269a1d434964ff76 https://github.com/phpmyadmin/phpmyadmin/commit/7d4f188c728564687580de0d269a... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-12-02 (Fri, 02 Dec 2016)
Changed paths: M ChangeLog M libraries/DatabaseInterface.php
Log Message: ----------- Current user might vary from the actual defined user
Use CURRENT_USER instead, which would give the actual user defined in User accounts table
Fix #12769
ChangeLog entry for #12769
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: b875cf13c5228b92d73d80ad4932594ef8ca60ca https://github.com/phpmyadmin/phpmyadmin/commit/b875cf13c5228b92d73d80ad4932... Author: Michal Čihař michal@cihar.com Date: 2016-12-02 (Fri, 02 Dec 2016)
Changed paths: M ChangeLog M libraries/DatabaseInterface.php
Log Message: ----------- Merge pull request #12770 from devenbansod/fix_12769
Fix #12769 : Current user might vary from the actual defined user
Commit: fd231056ac302ff8f105ee579b0e63f91d5dbb49 https://github.com/phpmyadmin/phpmyadmin/commit/fd231056ac302ff8f105ee579b0e... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-12-03 (Sat, 03 Dec 2016)
Changed paths: M libraries/Table.php
Log Message: ----------- $length can be blank, also precision in DEFAULT NULL is not required
Fix #12778
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 8b4b64050a9799c6b2729baa6fcc11ffdd96df98 https://github.com/phpmyadmin/phpmyadmin/commit/8b4b64050a9799c6b2729baa6fcc... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-12-03 (Sat, 03 Dec 2016)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog for #12778
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 43d1b53d76a77b971613dbcf61ff165a796dd87d https://github.com/phpmyadmin/phpmyadmin/commit/43d1b53d76a77b971613dbcf61ff... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-12-03 (Sat, 03 Dec 2016)
Changed paths: M ChangeLog M libraries/DatabaseInterface.php
Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6
Conflicts: ChangeLog
Commit: 82c369334d6def8262d7fa6a0aa799143e88b044 https://github.com/phpmyadmin/phpmyadmin/commit/82c369334d6def8262d7fa6a0aa7... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-12-03 (Sat, 03 Dec 2016)
Changed paths: M libraries/rte/rte_list.lib.php
Log Message: ----------- Use user-link instead of control-link to query INFORMATION_SCHEMA.*
This virtual database is automatically populated based on the privileges of the user.
Issue #12769
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: eeb016bf4df26f6927c1dd233b94f62d94c0e398 https://github.com/phpmyadmin/phpmyadmin/commit/eeb016bf4df26f6927c1dd233b94... Author: Michael Zarubin mzarubin@plesk.com Date: 2016-12-03 (Sat, 03 Dec 2016)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Fix #12757 SQL syntax errror on MariaDB < 10.0.2 in check for mysql password check plugin
Signed-off-by: Michael Zarubin mzarubin@gmail.com
Commit: 4f29bbd76ae8cb76c8fe1932ae642a5cea48ba38 https://github.com/phpmyadmin/phpmyadmin/commit/4f29bbd76ae8cb76c8fe1932ae64... Author: Michal Čihař michal@cihar.com Date: 2016-12-03 (Sat, 03 Dec 2016)
Changed paths: M ChangeLog
Log Message: ----------- Changelog entry for #12757 and #12777
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 028998f82978f52555425eace23d63b20ce82b80 https://github.com/phpmyadmin/phpmyadmin/commit/028998f82978f52555425eace23d... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-12-05 (Mon, 05 Dec 2016)
Changed paths: M ChangeLog M doc/require.rst
Log Message: ----------- Fix #12784 Remove ctype installation suggestion
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: fe802e1d6a0278f4caf68d9c45a3da075d5c16a8 https://github.com/phpmyadmin/phpmyadmin/commit/fe802e1d6a0278f4caf68d9c45a3... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-12-05 (Mon, 05 Dec 2016)
Changed paths: M ChangeLog M libraries/sql-parser/src/Utils/Formatter.php
Log Message: ----------- Fix #12780 Format button replaces all text with blank spaces
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: cf6129df640cc329203892f0bdbfd383e179720f https://github.com/phpmyadmin/phpmyadmin/commit/cf6129df640cc329203892f0bdbf... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-12-05 (Mon, 05 Dec 2016)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog updated for 4.6.5.2
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: ce714410ec320f5c50bdb733a8fc6c30d4bc9454 https://github.com/phpmyadmin/phpmyadmin/commit/ce714410ec320f5c50bdb733a8fc... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M test/bootstrap-dist.php
Log Message: ----------- Use vendor specific path when loading gettext in tests
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e627cf197c3ac7dcf6dc4c6beecac76a9cbfd169 https://github.com/phpmyadmin/phpmyadmin/commit/e627cf197c3ac7dcf6dc4c6beeca... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M test/libraries/php-gettext/PMA_FileReader_test.php M test/libraries/php-gettext/PMA_StreamReader_test.php M test/libraries/php-gettext/PMA_StringReader_test.php M test/libraries/php-gettext/PMA_gettext_test.php M test/libraries/php-gettext/Parsing_test.php
Log Message: ----------- Remove not needed includes
We already include this on bootstrap.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 79d33084f3e7036b81487347138b2ae70179d459 https://github.com/phpmyadmin/phpmyadmin/commit/79d33084f3e7036b81487347138b... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M test/classes/LanguageTest.php
Log Message: ----------- Add validation prior to using object
Otherwise the test failure is really not obvious.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 15bac5f51282712656fb6273d046e18faf81aa1a https://github.com/phpmyadmin/phpmyadmin/commit/15bac5f51282712656fb6273d046... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M test/classes/ConfigTest.php M test/classes/VersionInformationTest.php
Log Message: ----------- Flag tests needing network access
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e182ba99072dab5a83cb2a8f06d3d86b97718d12 https://github.com/phpmyadmin/phpmyadmin/commit/e182ba99072dab5a83cb2a8f06d3... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M test/classes/ConfigTest.php
Log Message: ----------- Revert to auto for further tests
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e3641a386b5e2338f67282c411c4a1817f840189 https://github.com/phpmyadmin/phpmyadmin/commit/e3641a386b5e2338f67282c411c4... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M libraries/gis/GISVisualization.php
Log Message: ----------- Avoid using hardcoded tcpdf path
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 18a96f017889bd866c94c734864cd634f9d9016e https://github.com/phpmyadmin/phpmyadmin/commit/18a96f017889bd866c94c734864c... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M test/classes/gis/GISGeometrycollectionTest.php M test/classes/gis/GISLinestringTest.php M test/classes/gis/GISMultilinestringTest.php M test/classes/gis/GISMultipointTest.php M test/classes/gis/GISMultipolygonTest.php M test/classes/gis/GISPointTest.php M test/classes/gis/GISPolygonTest.php
Log Message: ----------- Fix path to tcpdf include
Otherwise we do not honor vendor configuration.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: ec9139edefc9fd916c31cd06213558d64eaadbce https://github.com/phpmyadmin/phpmyadmin/commit/ec9139edefc9fd916c31cd062135... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M test/classes/gis/GISGeometrycollectionTest.php M test/classes/gis/GISLinestringTest.php M test/classes/gis/GISMultilinestringTest.php M test/classes/gis/GISMultipointTest.php M test/classes/gis/GISMultipolygonTest.php M test/classes/gis/GISPointTest.php M test/classes/gis/GISPolygonTest.php M test/classes/plugin/transformations/TransformationPluginsTest.php
Log Message: ----------- Do not try to run gd based tests if gd extension is not there
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 9b1e8fb0745c1a45687c18ba5f1d4530976bdc33 https://github.com/phpmyadmin/phpmyadmin/commit/9b1e8fb0745c1a45687c18ba5f1d... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M doc/setup.rst
Log Message: ----------- Add docker label
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 5273729cf50ec39af39e855a90289cb70887ac4e https://github.com/phpmyadmin/phpmyadmin/commit/5273729cf50ec39af39e855a9028... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M doc/setup.rst
Log Message: ----------- Fix path to example configuration
Fixes #12787
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 1ae6275be73d65a393aaa6829d4a71e5a1bf0045 https://github.com/phpmyadmin/phpmyadmin/commit/1ae6275be73d65a393aaa6829d4a... Author: Michal Čihař michal@cihar.com Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths: M ChangeLog M libraries/DbSearch.php M libraries/navigation/nodes/Node.php
Log Message: ----------- Fix wrong parameter to escapeString
These come from f14cffd
Fixes #12786
Signed-off-by: Michal Čihař michal@cihar.com
Commit: afb5051fc4232d0add0ed8473cbba214c63797ab https://github.com/phpmyadmin/phpmyadmin/commit/afb5051fc4232d0add0ed8473cbb... Author: Jörn Gorres joern@gorres.com Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths: M po/de.po
Log Message: ----------- Translated using Weblate (German)
Currently translated at 99.4% (3205 of 3222 strings)
[CI skip]
Commit: 108b52f5990d9e9cf41f33fe68593519546e9f9a https://github.com/phpmyadmin/phpmyadmin/commit/108b52f5990d9e9cf41f33fe6859... Author: Weblate noreply@weblate.org Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths: M ChangeLog M libraries/DbSearch.php M libraries/navigation/nodes/Node.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 14a1a69a78a8e6c5ccbe30a308e74a7a513fb3a5 https://github.com/phpmyadmin/phpmyadmin/commit/14a1a69a78a8e6c5ccbe30a308e7... Author: Michal Čihař michal@cihar.com Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths: M ChangeLog M js/functions.js
Log Message: ----------- Fixed javascript error on new version link
Fixes #12792
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 4df65209a1fa91b8d981af0ecdd171596606d8f7 https://github.com/phpmyadmin/phpmyadmin/commit/4df65209a1fa91b8d981af0ecdd1... Author: Michal Čihař michal@cihar.com Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths: M ChangeLog M composer.json
Log Message: ----------- Add information about required and suggested extensions to composer.json
Fixes #12785
Signed-off-by: Michal Čihař michal@cihar.com
Commit: d7e7a0653502515968cab43877a3c4fdbc127819 https://github.com/phpmyadmin/phpmyadmin/commit/d7e7a0653502515968cab43877a3... Author: Michal Čihař michal@cihar.com Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths: M composer.json
Log Message: ----------- Add pcre to deps
Issue #12785
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 5f558b0a1d8c0da3a79da8b11d735d4c6febe5da https://github.com/phpmyadmin/phpmyadmin/commit/5f558b0a1d8c0da3a79da8b11d73... Author: Michal Čihař michal@cihar.com Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths: M composer.json
Log Message: ----------- Add openssl to sugest
Issue #12785
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 62517b08e248401d8ac57bcec0a0809374c9cf26 https://github.com/phpmyadmin/phpmyadmin/commit/62517b08e248401d8ac57bcec0a0... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php
Log Message: ----------- Merge remote-tracking branch 'security/pull/218' into QA_4_6-security
Commit: 3c9d440990b9d6462b9d5eea739c3b5fc18c5967 https://github.com/phpmyadmin/phpmyadmin/commit/3c9d440990b9d6462b9d5eea739c... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M templates/navigation/logo.phtml
Log Message: ----------- Merge remote-tracking branch 'security/pull/217' into QA_4_6-security
Commit: 96b4f13e54c9ebbebfd19d0690bfa0812b6818c1 https://github.com/phpmyadmin/phpmyadmin/commit/96b4f13e54c9ebbebfd19d0690bf... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/controllers/database/DatabaseStructureController.php
Log Message: ----------- Quote table name for use in regexp
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 4c84070ad6136c3158caa93286754ebbfbce61ab https://github.com/phpmyadmin/phpmyadmin/commit/4c84070ad6136c3158caa9328675... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M setup/frames/index.inc.php
Log Message: ----------- Avoid using REQUEST_URI in form action
It's really not necessary here and might cause redirection issues.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 9d712359d00afa828d5dd70325b213071d411f83 https://github.com/phpmyadmin/phpmyadmin/commit/9d712359d00afa828d5dd70325b2... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/navigation/NavigationTree.php
Log Message: ----------- Fix typo
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e37bf40f44a3272a6709eb5b38feccac41658e3f https://github.com/phpmyadmin/phpmyadmin/commit/e37bf40f44a3272a6709eb5b38fe... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/config/PageSettings.php
Log Message: ----------- Avoid using REQUEST_URI for redirection
* Stick with PMA_sendHeaderLocation to handle server weirdness * Use already calculated URL
Signed-off-by: Michal Čihař michal@cihar.com
Commit: ec6c55c1df67b6a6e809087b095f36cfcf703d9f https://github.com/phpmyadmin/phpmyadmin/commit/ec6c55c1df67b6a6e809087b095f... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/config/PageSettings.php
Log Message: ----------- Add missing ;
Signed-off-by: Michal Čihař michal@cihar.com
Commit: a134a0117765644cd6d9311b5e3d963a20e6ed15 https://github.com/phpmyadmin/phpmyadmin/commit/a134a0117765644cd6d9311b5e3d... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M tbl_replace.php
Log Message: ----------- Avoid infinite recursion on goto
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 3a6247674e653507294f23480b4c0e1c532badbe https://github.com/phpmyadmin/phpmyadmin/commit/3a6247674e653507294f23480b4c... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/Theme.php
Log Message: ----------- Do not provide fallback to cookie for font size
* This should be already handled by Config class * Injecting cookie value to CSS could be security risk
Signed-off-by: Michal Čihař michal@cihar.com
Commit: f2bfa7d745a49ecc6625924a376c66ace194d8d1 https://github.com/phpmyadmin/phpmyadmin/commit/f2bfa7d745a49ecc6625924a376c... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M scripts/create-release.sh M scripts/generate-mo M scripts/generate-sprites M scripts/lang-cleanup.sh M scripts/line-counts.sh M scripts/locales-contributors M scripts/remove-incomplete-mo M scripts/transformations_generator_main_class.sh M scripts/transformations_generator_plugin.sh M scripts/update-po M scripts/upload-release M test/install-browserstack M test/install-runkit M test/start-local-server
Log Message: ----------- Avoid running shell scripts as CGI
There is really no reason for that besides misconfigured servers.
This is followup for PMASA-2016-54
Signed-off-by: Michal Čihař michal@cihar.com
Commit: fe394c90a877216cb34e58997b557dca79fd94ab https://github.com/phpmyadmin/phpmyadmin/commit/fe394c90a877216cb34e58997b55... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M scripts/create-release.sh M scripts/generate-mo M scripts/generate-sprites M scripts/lang-cleanup.sh M scripts/line-counts.sh M scripts/locales-contributors M scripts/remove-incomplete-mo M scripts/transformations_generator_main_class.sh M scripts/transformations_generator_plugin.sh M scripts/update-po M scripts/upload-release M test/install-browserstack M test/install-runkit M test/start-local-server
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: 3b6ed1f9ecaab86c488d106b1588d7683a6d53ef https://github.com/phpmyadmin/phpmyadmin/commit/3b6ed1f9ecaab86c488d106b1588... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/core.lib.php M test/libraries/core/PMA_cleanupPathInfo_test.php
Log Message: ----------- Improve PHP path cleanup
- properly handle situation when query string contains PATH_INFO - cleanup path from any relative parts
Signed-off-by: Michal Čihař michal@cihar.com
Commit: d61dbc1d6fbb30c5d661921400e31d5bd920cae2 https://github.com/phpmyadmin/phpmyadmin/commit/d61dbc1d6fbb30c5d661921400e3... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/core.lib.php
Log Message: ----------- Use unserialize without objects if available
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 053e73d0c3a2280f2138b6f1405bce41851da03a https://github.com/phpmyadmin/phpmyadmin/commit/053e73d0c3a2280f2138b6f1405b... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/core.lib.php
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: 9693522a86757862671c1197dc767c72b04ba3aa https://github.com/phpmyadmin/phpmyadmin/commit/9693522a86757862671c1197dc76... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/core.lib.php
Log Message: ----------- Revert "Use unserialize without objects if available"
This reverts commit d61dbc1d6fbb30c5d661921400e31d5bd920cae2.
Honestly I don't think this work as documented:
PHP Warning: unserialize() expects parameter 2 to be array, boolean given
Commit: 7b5c2699f6fe459de1a86ccc873227f7632670f7 https://github.com/phpmyadmin/phpmyadmin/commit/7b5c2699f6fe459de1a86ccc8732... Author: Michal Čihař michal@cihar.com Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths: M libraries/core.lib.php
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: de4fb44eeb041ef933639969d09e46ac37d5ac17 https://github.com/phpmyadmin/phpmyadmin/commit/de4fb44eeb041ef933639969d09e... Author: Lucie Procházková lucieaprochazkova@gmail.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M po/cs.po
Log Message: ----------- Translated using Weblate (Czech)
Currently translated at 93.3% (3008 of 3222 strings)
[CI skip]
Commit: 78af58dd0a306c56d7f30bf25641a81187e28346 https://github.com/phpmyadmin/phpmyadmin/commit/78af58dd0a306c56d7f30bf25641... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-12-12 (Mon, 12 Dec 2016)
Changed paths: M ChangeLog M doc/faq.rst
Log Message: ----------- Improve documentation for servers with Suhosin; issue #12434
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: 14c8214bb41909920b5eb94a9ff8b2a628486cdc https://github.com/phpmyadmin/phpmyadmin/commit/14c8214bb41909920b5eb94a9ff8... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M ChangeLog M doc/faq.rst
Log Message: ----------- Merge remote-tracking branch 'origin/pull/12805' into QA_4_6
Commit: c72b1563d13e26cc870b332afa7a2bf104229b65 https://github.com/phpmyadmin/phpmyadmin/commit/c72b1563d13e26cc870b332afa7a... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M doc/config.rst M doc/credits.rst M doc/faq.rst M doc/glossary.rst
Log Message: ----------- Fix various broken or outdated links
Backported from master
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 1308ecccd0cd2289aa91a5f766aa0286d17c3500 https://github.com/phpmyadmin/phpmyadmin/commit/1308ecccd0cd2289aa91a5f766aa... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M .travis.yml
Log Message: ----------- Enable testing in PHP 7.1
I hoped there will be phpMyAdmin 4.7.0 by time PHP 7.1 is out, but obviously that's not the case, so we should fix 4.6 branch as well.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 034047a21908d1a547682862b9589191d036c9d2 https://github.com/phpmyadmin/phpmyadmin/commit/034047a21908d1a547682862b958... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M test/install-runkit
Log Message: ----------- There is no runkit for 7.1
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 48144987d810a2b2ec113f1d94375387f3782e84 https://github.com/phpmyadmin/phpmyadmin/commit/48144987d810a2b2ec113f1d9437... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M libraries/plugins/schema/svg/Svg.php M libraries/plugins/schema/svg/SvgRelationSchema.php
Log Message: ----------- Ensure font size is integer, we do further calculations with it
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 9f5789dff85302cc78d23ded2e67dd59d57f6870 https://github.com/phpmyadmin/phpmyadmin/commit/9f5789dff85302cc78d23ded2e67... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M test/libraries/PMA_server_status_monitor_test.php
Log Message: ----------- Set reasonable mock value for tests
Set integer where we do a COUNT() SQL.
See also #12539
Signed-off-by: Michal Čihař michal@cihar.com
Commit: ffaf589a26432a9d12b329c7c102ce032568e4e7 https://github.com/phpmyadmin/phpmyadmin/commit/ffaf589a26432a9d12b329c7c102... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M libraries/SysInfoLinux.php
Log Message: ----------- Fix numeric errors
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: cb6d733e5ac2a9e3720ae69918041ae95b27d4c4 https://github.com/phpmyadmin/phpmyadmin/commit/cb6d733e5ac2a9e3720ae6991804... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M test/libraries/PMA_server_status_monitor_test.php
Log Message: ----------- Fix other places of wrong value for # in tests
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 1fd24b650d005782ac9f9edc73fb4f46d4ad0410 https://github.com/phpmyadmin/phpmyadmin/commit/1fd24b650d005782ac9f9edc73fb... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M ChangeLog M libraries/phpseclib/Crypt/Base.php M libraries/phpseclib/Crypt/Random.php
Log Message: ----------- Update phpSecLib to 2.0.4
* fix E_DEPRECATED errors on PHP 7.1 * Random: fix issues with serialize()
Issue #12800
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 28968fe919964d32ed30a84dcb92ff0ef53df5ed https://github.com/phpmyadmin/phpmyadmin/commit/28968fe919964d32ed30a84dcb92... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M test/libraries/PMA_server_status_queries_test.php M test/libraries/PMA_server_status_test.php
Log Message: ----------- Set correct Uptime value for tests
MySQL returns this as integer, so we should do the same for tests.
See also #12539
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 569a4d280c34fe463bff894583114d65a3b6835b https://github.com/phpmyadmin/phpmyadmin/commit/569a4d280c34fe463bff89458311... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M test/libraries/PMA_server_status_test.php
Log Message: ----------- Fix test expectations
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 2086bb61c17fc104074867c3df6b01d0e1a3ea70 https://github.com/phpmyadmin/phpmyadmin/commit/2086bb61c17fc104074867c3df6b... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M ChangeLog
Log Message: ----------- Add changelog entry for PHP 7.1 compatibility
Fixes #12800
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 7ae3259b6406628c941fc23844256d8d938a261d https://github.com/phpmyadmin/phpmyadmin/commit/7ae3259b6406628c941fc2384425... Author: Laura Arjona Reina larjona@larjona.net Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M po/es.po
Log Message: ----------- Translated using Weblate (Spanish)
Currently translated at 99.7% (3215 of 3222 strings)
[CI skip]
Commit: 685b51d5d517fa69297617c18e0cb4c7caeb9482 https://github.com/phpmyadmin/phpmyadmin/commit/685b51d5d517fa69297617c18e0c... Author: jorge jansen abreu condecalifornia@hotmail.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M po/es.po
Log Message: ----------- Translated using Weblate (Spanish)
Currently translated at 99.8% (3216 of 3222 strings)
[CI skip]
Commit: 90e4325bcf57d2a7d4f8ae9b1ac96d370a4c7c97 https://github.com/phpmyadmin/phpmyadmin/commit/90e4325bcf57d2a7d4f8ae9b1ac9... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M setup/frames/index.inc.php M setup/lib/index.lib.php M setup/scripts.js
Log Message: ----------- Rewrite https in setup and messages handling
- The client side check is more reliable - Does not depend on server setup - Removed related inline javascript (see #12261)
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 7cccdd022cdc291d1d6d010d2d35dcf3c8cd072a https://github.com/phpmyadmin/phpmyadmin/commit/7cccdd022cdc291d1d6d010d2d35... Author: Laura Arjona Reina larjona@larjona.net Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M po/es.po
Log Message: ----------- Translated using Weblate (Spanish)
Currently translated at 99.8% (3218 of 3222 strings)
[CI skip]
Commit: 353358c1f49e3672ce0531c48742baf9de70fe29 https://github.com/phpmyadmin/phpmyadmin/commit/353358c1f49e3672ce0531c48742... Author: Weblate noreply@weblate.org Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M setup/frames/index.inc.php M setup/lib/index.lib.php M setup/scripts.js
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: be8eb4bf3e080d90583d68ef685949b7d093e450 https://github.com/phpmyadmin/phpmyadmin/commit/be8eb4bf3e080d90583d68ef6859... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M .travis.yml M ChangeLog M doc/config.rst M doc/credits.rst M doc/faq.rst M doc/glossary.rst M libraries/SysInfoLinux.php M libraries/phpseclib/Crypt/Base.php M libraries/phpseclib/Crypt/Random.php M libraries/plugins/schema/svg/Svg.php M libraries/plugins/schema/svg/SvgRelationSchema.php M po/cs.po M po/es.po M setup/frames/index.inc.php M setup/lib/index.lib.php M setup/scripts.js M test/install-runkit M test/libraries/PMA_server_status_monitor_test.php M test/libraries/PMA_server_status_queries_test.php M test/libraries/PMA_server_status_test.php
Log Message: ----------- Merge commit '90e4325bcf' into QA_4_6-security
Commit: 4fc04f39384d52a2b4894cfaff572e9a76927c62 https://github.com/phpmyadmin/phpmyadmin/commit/4fc04f39384d52a2b4894cfaff57... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M test/libraries/PMA_SetupIndex_test.php
Log Message: ----------- Adjust tests to new setup handling of messages
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 7c737eeb72fc99c7d14fb049489241dfe2467fe5 https://github.com/phpmyadmin/phpmyadmin/commit/7c737eeb72fc99c7d14fb0494892... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M po/es.po
Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6
Commit: f18e02b16d2c1bc68d461f912839fba8e2ee0fe3 https://github.com/phpmyadmin/phpmyadmin/commit/f18e02b16d2c1bc68d461f912839... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po
Log Message: ----------- Update po files
[CI skip]
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 8d5939348e46697bb5d3f6deff0cd4273db264c2 https://github.com/phpmyadmin/phpmyadmin/commit/8d5939348e46697bb5d3f6deff0c... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M libraries/Util.php
Log Message: ----------- Use current user in session cache key
This makes it automatically valid only for current user.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 665a5fcbe2e75c22a65c942a2ad8365b8599d1b3 https://github.com/phpmyadmin/phpmyadmin/commit/665a5fcbe2e75c22a65c942a2ad8... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M libraries/Util.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M test/libraries/PMA_SetupIndex_test.php
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: 2e561a296e29df9c2f57d959a7b8c519921dcd25 https://github.com/phpmyadmin/phpmyadmin/commit/2e561a296e29df9c2f57d959a7b8... Author: Burak Yavuz hitowerdigit@hotmail.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M po/tr.po
Log Message: ----------- Translated using Weblate (Turkish)
Currently translated at 100.0% (3222 of 3222 strings)
[CI skip]
Commit: 2b134240b80af4afd9bddef39b88f8c414d150d2 https://github.com/phpmyadmin/phpmyadmin/commit/2b134240b80af4afd9bddef39b88... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M libraries/Util.php
Log Message: ----------- Share code for session cache key calculation
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e922991f334036cb3eb7ba7ade699025b7e088f3 https://github.com/phpmyadmin/phpmyadmin/commit/e922991f334036cb3eb7ba7ade69... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M libraries/Util.php
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: 719cb1f3094bd43e7f644be33859eb2554bd235a https://github.com/phpmyadmin/phpmyadmin/commit/719cb1f3094bd43e7f644be33859... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M po/tr.po
Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6
Commit: a86450728a6c2b51ee1a7d9dda6ca5df5fc698b6 https://github.com/phpmyadmin/phpmyadmin/commit/a86450728a6c2b51ee1a7d9dda6c... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M po/cs.po
Log Message: ----------- Translated using Weblate (Czech)
Currently translated at 93.8% (3023 of 3222 strings)
[CI skip]
Commit: 15f63f3d96113b2317b52db8502f3f7f90250eec https://github.com/phpmyadmin/phpmyadmin/commit/15f63f3d96113b2317b52db8502f... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M po/cs.po
Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6
Commit: ca1abc679c305015966caffa86b23dbd19c4a06a https://github.com/phpmyadmin/phpmyadmin/commit/ca1abc679c305015966caffa86b2... Author: Giovanni Sora g.sora@tiscali.it Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M po/ia.po
Log Message: ----------- Translated using Weblate (Interlingua)
Currently translated at 74.7% (2407 of 3222 strings)
[CI skip]
Commit: a1fa82f39b96b1c30ccf49011f9f5023e86ca00c https://github.com/phpmyadmin/phpmyadmin/commit/a1fa82f39b96b1c30ccf49011f9f... Author: Weblate noreply@weblate.org Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M libraries/Util.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 73499a5e56a5d9fe1f0fa752dd38feee89b1ee65 https://github.com/phpmyadmin/phpmyadmin/commit/73499a5e56a5d9fe1f0fa752dd38... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M libraries/Util.php M libraries/core.lib.php
Log Message: ----------- Do not delete session on fatal error
I see no reason why this should be done, the fatal error is used in following cases:
* Very early when there is no session (eg. missing extension) * Invalid value for parameters * Invalid invocation like too big request
In neither case session removal will do any good.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: ef4e584eeae477f96b9380f82e6411d37b48aa66 https://github.com/phpmyadmin/phpmyadmin/commit/ef4e584eeae477f96b9380f82e64... Author: Michal Čihař michal@cihar.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M libraries/controllers/table/TableStructureController.php
Log Message: ----------- Fix return value documentation
Signed-off-by: Michal Čihař michal@cihar.com
Commit: fd897920d75e9ec8d3e76845a09254d4af779384 https://github.com/phpmyadmin/phpmyadmin/commit/fd897920d75e9ec8d3e76845a092... Author: monicagrau monicagrau@gmail.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M po/ca.po
Log Message: ----------- Translated using Weblate (Catalan)
Currently translated at 99.2% (3199 of 3222 strings)
[CI skip]
Commit: e40d0439fd8cc8d562d402fdaeeb40e72b38a24d https://github.com/phpmyadmin/phpmyadmin/commit/e40d0439fd8cc8d562d402fdaeeb... Author: Giovanni Sora g.sora@tiscali.it Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M po/ia.po
Log Message: ----------- Translated using Weblate (Interlingua)
Currently translated at 74.7% (2408 of 3222 strings)
[CI skip]
Commit: ceec247a205eb28f2c9da164d2d58549a2575837 https://github.com/phpmyadmin/phpmyadmin/commit/ceec247a205eb28f2c9da164d2d5... Author: Stefano Martinelli stefano.ste.martinelli@gmail.com Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M po/it.po
Log Message: ----------- Translated using Weblate (Italian)
Currently translated at 100.0% (3222 of 3222 strings)
[CI skip]
Commit: 9f775e4b0bdc4e1b8dfbcfec5955cc4b361b1abd https://github.com/phpmyadmin/phpmyadmin/commit/9f775e4b0bdc4e1b8dfbcfec5955... Author: Weblate noreply@weblate.org Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths: M libraries/controllers/table/TableStructureController.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 16c72323d1b8ea53516389bfa9c8a63113842461 https://github.com/phpmyadmin/phpmyadmin/commit/16c72323d1b8ea53516389bfa9c8... Author: Domen mitenem@outlook.com Date: 2016-12-14 (Wed, 14 Dec 2016)
Changed paths: M po/sl.po
Log Message: ----------- Translated using Weblate (Slovenian)
Currently translated at 100.0% (3222 of 3222 strings)
[CI skip]
Commit: 30bfba75dabb29000112b7448672ca814cd2a4cf https://github.com/phpmyadmin/phpmyadmin/commit/30bfba75dabb29000112b7448672... Author: Phillip Rohmberger rohmberger@hotmail.de Date: 2016-12-14 (Wed, 14 Dec 2016)
Changed paths: M po/de.po
Log Message: ----------- Translated using Weblate (German)
Currently translated at 99.5% (3206 of 3222 strings)
[CI skip]
Commit: 92d41e4d7f633cd10cce7cb94458550910c901b1 https://github.com/phpmyadmin/phpmyadmin/commit/92d41e4d7f633cd10cce7cb94458... Author: Παναγιώτης Παπάζογλου papaz_p@yahoo.com Date: 2016-12-14 (Wed, 14 Dec 2016)
Changed paths: M po/el.po
Log Message: ----------- Translated using Weblate (Greek)
Currently translated at 100.0% (3222 of 3222 strings)
[CI skip]
Commit: 715bdf3a4993f1ba85a539c4fbea4819866295d8 https://github.com/phpmyadmin/phpmyadmin/commit/715bdf3a4993f1ba85a539c4fbea... Author: Michal Čihař michal@cihar.com Date: 2016-12-14 (Wed, 14 Dec 2016)
Changed paths: M ChangeLog M libraries/DatabaseInterface.php M libraries/Util.php
Log Message: ----------- Fixed operation with lower_case_table_names=2
The problem is that mysqli_fields_meta returns orgtable as lowercase making phpMyAdmin treat it as alias later nad finding no fields for original table.
Fixes issue #11816
Signed-off-by: Michal Čihař michal@cihar.com
Commit: eec9d3f3ddeb0c34a3644d01055dfa21985d7dd4 https://github.com/phpmyadmin/phpmyadmin/commit/eec9d3f3ddeb0c34a3644d01055d... Author: Michal Čihař michal@cihar.com Date: 2016-12-14 (Wed, 14 Dec 2016)
Changed paths: M libraries/DatabaseInterface.php
Log Message: ----------- Use === to avoid suprises with numeric table names
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 96350a79846edc160d3165dd261820a632504839 https://github.com/phpmyadmin/phpmyadmin/commit/96350a79846edc160d3165dd2618... Author: Michal Čihař michal@cihar.com Date: 2016-12-14 (Wed, 14 Dec 2016)
Changed paths: M ChangeLog M libraries/rte/rte_routines.lib.php
Log Message: ----------- Do not use control link when working with stored procedures
Fixed stored procedure execution.
Fixes #12813
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e3a4bfe75706225de084681b54c6e5a054bf5814 https://github.com/phpmyadmin/phpmyadmin/commit/e3a4bfe75706225de084681b54c6... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-12-14 (Wed, 14 Dec 2016)
Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php
Log Message: ----------- Fix display of custom header and footer in certain edge cases. Issues #12801 and #12802
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: 96c267cdf70f955f32cc6d4b43de5de98c55fe82 https://github.com/phpmyadmin/phpmyadmin/commit/96c267cdf70f955f32cc6d4b43de... Author: dingo thirteen dingo13@gmail.com Date: 2016-12-14 (Wed, 14 Dec 2016)
Changed paths: M po/nl.po
Log Message: ----------- Translated using Weblate (Dutch)
Currently translated at 100.0% (3222 of 3222 strings)
[CI skip]
Commit: ba5212cb46d8f67f0b2713dab560cf5eb60ef5fb https://github.com/phpmyadmin/phpmyadmin/commit/ba5212cb46d8f67f0b2713dab560... Author: Marc Delisle marc@infomarc.info Date: 2016-12-15 (Thu, 15 Dec 2016)
Changed paths: M po/fr.po
Log Message: ----------- Translated using Weblate (French)
Currently translated at 100.0% (3222 of 3222 strings)
[CI skip]
Commit: 128b0279dec0900abd9a25f1635f935352ba0525 https://github.com/phpmyadmin/phpmyadmin/commit/128b0279dec0900abd9a25f1635f... Author: Marc Delisle marc@infomarc.info Date: 2016-12-15 (Thu, 15 Dec 2016)
Changed paths: M po/fr.po
Log Message: ----------- Translated using Weblate (French)
Currently translated at 100.0% (3222 of 3222 strings)
[CI skip]
Commit: 352a5d79d5e429b8bd94e076155be452e2cac19f https://github.com/phpmyadmin/phpmyadmin/commit/352a5d79d5e429b8bd94e076155b... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-12-15 (Thu, 15 Dec 2016)
Changed paths: M js/rte.js M libraries/rte/rte_routines.lib.php
Log Message: ----------- MySQL allows precision to be specified for DATETIME, TIME type fields too
Fix #12814
Ref : http://dev.mysql.com/doc/refman/5.7/en/fractional-seconds.html
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 967755a1de0d56adf75acb764943b3ce9142b584 https://github.com/phpmyadmin/phpmyadmin/commit/967755a1de0d56adf75acb764943... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-12-15 (Thu, 15 Dec 2016)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog for #12814
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: ea619794e54bdcd269f504440491ce1848eb6bb3 https://github.com/phpmyadmin/phpmyadmin/commit/ea619794e54bdcd269f504440491... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-12-17 (Sat, 17 Dec 2016)
Changed paths: M doc/faq.rst
Log Message: ----------- Fix documentation markup
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: 33af5ac3d6e2fdd0a9fa9730ded87190e0f38294 https://github.com/phpmyadmin/phpmyadmin/commit/33af5ac3d6e2fdd0a9fa9730ded8... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-12-19 (Mon, 19 Dec 2016)
Changed paths: M phpunit.xml.dist
Log Message: ----------- Uncomment mistakenly commented Selenium testing setting
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 391c79e17728c394b7fde74184f0f7f55c97b881 https://github.com/phpmyadmin/phpmyadmin/commit/391c79e17728c394b7fde74184f0... Author: Franco fulanodetal.github1@openaliasbox.org Date: 2016-12-19 (Mon, 19 Dec 2016)
Changed paths: M po/es.po
Log Message: ----------- Translated using Weblate (Spanish)
Currently translated at 100.0% (3222 of 3222 strings)
[CI skip]
Commit: 59934c2914eec9406b70771f74522a0299350093 https://github.com/phpmyadmin/phpmyadmin/commit/59934c2914eec9406b70771f7452... Author: Weblate noreply@weblate.org Date: 2016-12-19 (Mon, 19 Dec 2016)
Changed paths: M phpunit.xml.dist
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 7ad21270c45e512f91da03698de67fb6111b21a8 https://github.com/phpmyadmin/phpmyadmin/commit/7ad21270c45e512f91da03698de6... Author: Michal Čihař michal@cihar.com Date: 2016-12-19 (Mon, 19 Dec 2016)
Changed paths: R test/.htaccess
Log Message: ----------- Remove .htaccess from tests
Issue #12348
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 53274555b60a901f11a4fa1804576fc9072e7058 https://github.com/phpmyadmin/phpmyadmin/commit/53274555b60a901f11a4fa180457... Author: Michal Čihař michal@cihar.com Date: 2016-12-19 (Mon, 19 Dec 2016)
Changed paths: M scripts/lang-cleanup.sh
Log Message: ----------- Add source release support
See #12348
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e267c6f9af2a8a4f9c272e9ad48de94e8c96c036 https://github.com/phpmyadmin/phpmyadmin/commit/e267c6f9af2a8a4f9c272e9ad48d... Author: Michal Čihař michal@cihar.com Date: 2016-12-19 (Mon, 19 Dec 2016)
Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php
Log Message: ----------- Merge remote-tracking branch 'origin/pull/12803' into tmp
Commit: 7d361806c353911b2828053dc2e92fa270852838 https://github.com/phpmyadmin/phpmyadmin/commit/7d361806c353911b2828053dc2e9... Author: Michal Čihař michal@cihar.com Date: 2016-12-19 (Mon, 19 Dec 2016)
Changed paths: M libraries/Config.php M libraries/Footer.php M libraries/Header.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php
Log Message: ----------- Share code for rendering custom header and footer
Fixes #12802
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 2557709949398c560455b53816f29ea5890c52aa https://github.com/phpmyadmin/phpmyadmin/commit/2557709949398c560455b53816f2... Author: Michal Čihař michal@cihar.com Date: 2016-12-19 (Mon, 19 Dec 2016)
Changed paths: M libraries/Util.php M libraries/core.lib.php
Log Message: ----------- Merge pull request #12807 from nijel/cookie-fatal
Do not delete session on fatal error
Commit: ffe68c7219eac49ebc7066c732a42c27652a9998 https://github.com/phpmyadmin/phpmyadmin/commit/ffe68c7219eac49ebc7066c732a4... Author: Michal Čihař michal@cihar.com Date: 2016-12-19 (Mon, 19 Dec 2016)
Changed paths: M ChangeLog M doc/config.rst M libraries/DatabaseInterface.php M libraries/config.default.php
Log Message: ----------- Honor user configured connection collation
* the user set collation is now honored * default value has been changed to utf8mb4 * it is downgraded to utf8 if server does not support it
Fixes #12826
Signed-off-by: Michal Čihař michal@cihar.com
Commit: a856a61c9d62094570ee612efb6aaf475ead62d2 https://github.com/phpmyadmin/phpmyadmin/commit/a856a61c9d62094570ee612efb6a... Author: Michal Čihař michal@cihar.com Date: 2016-12-19 (Mon, 19 Dec 2016)
Changed paths: M test/classes/plugin/auth/AuthenticationHttpTest.php
Log Message: ----------- Fix HTTP auth test expectations
Signed-off-by: Michal Čihař michal@cihar.com
Commit: d730db12597ddf99ec7346d1dada59e3200e2421 https://github.com/phpmyadmin/phpmyadmin/commit/d730db12597ddf99ec7346d1dada... Author: Michal Čihař michal@cihar.com Date: 2016-12-19 (Mon, 19 Dec 2016)
Changed paths: M libraries/pmd_common.php M templates/database/designer/database_tables.phtml M templates/database/designer/table_list.phtml
Log Message: ----------- Add some missing html encoding
Issue #12804
Signed-off-by: Michal Čihař michal@cihar.com
Commit: b866371b9a79625c11a91dec4feb4e206ad48dc0 https://github.com/phpmyadmin/phpmyadmin/commit/b866371b9a79625c11a91dec4feb... Author: Michal Čihař michal@cihar.com Date: 2016-12-20 (Tue, 20 Dec 2016)
Changed paths: M libraries/plugins/auth/AuthenticationCookie.php
Log Message: ----------- Determine whether to use openssl just once
Issue #12293
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 03bc52f6dcbb8e549b2e0fef3d60e7103681558a https://github.com/phpmyadmin/phpmyadmin/commit/03bc52f6dcbb8e549b2e0fef3d60... Author: Michal Čihař michal@cihar.com Date: 2016-12-20 (Tue, 20 Dec 2016)
Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.php
Log Message: ----------- Correctly report OpenSSL errors from cookie encryption
Without calling openssl_error_string() we pollute openssl global state and some other library might report this as failure (eg. mysqlnd driver when connecting to SSL enabled server).
Fixes #12293
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 30cd5fc358d08d95a9640d22311deaf8e4fc1032 https://github.com/phpmyadmin/phpmyadmin/commit/30cd5fc358d08d95a9640d22311d... Author: Michal Čihař michal@cihar.com Date: 2016-12-20 (Tue, 20 Dec 2016)
Changed paths: M libraries/plugins/auth/AuthenticationCookie.php M test/classes/plugin/auth/AuthenticationCookieTest.php
Log Message: ----------- Use same encryption key with openssl and phpseclib
Issue #12293
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 09da5eb49f4bef0d16c48c6bc30b3b17a3b8f799 https://github.com/phpmyadmin/phpmyadmin/commit/09da5eb49f4bef0d16c48c6bc30b... Author: Michal Čihař michal@cihar.com Date: 2016-12-20 (Tue, 20 Dec 2016)
Changed paths: M test/classes/plugin/auth/AuthenticationCookieTest.php
Log Message: ----------- Test both with and without phpseclib
This ensures we generate compatible data in both cases.
Issue #12293
Signed-off-by: Michal Čihař michal@cihar.com
Commit: c8a15f22123cebd6ba939bab222091c14de8fce2 https://github.com/phpmyadmin/phpmyadmin/commit/c8a15f22123cebd6ba939bab2220... Author: Michal Čihař michal@cihar.com Date: 2016-12-20 (Tue, 20 Dec 2016)
Changed paths: M ChangeLog M js/rte.js M libraries/rte/rte_routines.lib.php
Log Message: ----------- Merge remote-tracking branch 'origin/pull/12815' into QA_4_6
Commit: 6f01864e8957f57a83a87f368a06a48f1b57e82c https://github.com/phpmyadmin/phpmyadmin/commit/6f01864e8957f57a83a87f368a06... Author: Michal Čihař michal@cihar.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M ChangeLog M js/tbl_structure.js
Log Message: ----------- Fixed moving of columns with whitespace in name
Fixes #12841
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e1d9e31dff329acc05e94fe03f0b8a21c4d5b437 https://github.com/phpmyadmin/phpmyadmin/commit/e1d9e31dff329acc05e94fe03f0b... Author: Michal Čihař michal@cihar.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M ChangeLog M doc/config.rst M doc/faq.rst M js/rte.js M js/tbl_structure.js M libraries/Config.php M libraries/DatabaseInterface.php M libraries/Footer.php M libraries/Header.php M libraries/Util.php M libraries/config.default.php M libraries/controllers/table/TableStructureController.php M libraries/core.lib.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php M libraries/pmd_common.php M libraries/rte/rte_routines.lib.php M phpunit.xml.dist M po/ca.po M po/cs.po M po/de.po M po/el.po M po/es.po M po/fr.po M po/ia.po M po/it.po M po/nl.po M po/sl.po M po/tr.po M scripts/lang-cleanup.sh M templates/database/designer/database_tables.phtml M templates/database/designer/table_list.phtml R test/.htaccess M test/classes/plugin/auth/AuthenticationCookieTest.php M test/classes/plugin/auth/AuthenticationHttpTest.php
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: 695a488c4294ebdb972607d8296746310ddb5b7b https://github.com/phpmyadmin/phpmyadmin/commit/695a488c4294ebdb972607d82967... Author: Michal Čihař michal@cihar.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M libraries/replication_gui.lib.php
Log Message: ----------- Do not allow arbitrary connection in replication setup without AllowArbitraryServer
Signed-off-by: Michal Čihař michal@cihar.com
Commit: c962ee4287b50af754b8fe72c0c4ef6cebf3c489 https://github.com/phpmyadmin/phpmyadmin/commit/c962ee4287b50af754b8fe72c0c4... Author: Michal Čihař michal@cihar.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M doc/setup.rst M libraries/config/ConfigFile.php M libraries/vendor_config.php M setup/config.php M setup/frames/config.inc.php M setup/frames/index.inc.php M setup/lib/index.lib.php M test/classes/config/ConfigFileTest.php M test/libraries/PMA_SetupIndex_test.php
Log Message: ----------- Remove setup download/load/delete features
This removes risk of third party manipulating with the configuration as there was race condition between editing and using the file.
Downloading the file should not be big hassle and this really makes the whole setup a bit simpler.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: f792f294f219290f3a9360788940d0e491f5d009 https://github.com/phpmyadmin/phpmyadmin/commit/f792f294f219290f3a9360788940... Author: Michal Čihař michal@cihar.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M setup/index.php
Log Message: ----------- Disable setup if configuration already exists
The setup allows to figure out quite a lot about system and network, so it's safer to block access to it once phpMyAdmin has been configured.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 8973db0651e74253d3cebda7d772def0d7d117d9 https://github.com/phpmyadmin/phpmyadmin/commit/8973db0651e74253d3cebda7d772... Author: Rogerio Marques rogerio@algoincomum.com.br Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M po/pt_BR.po
Log Message: ----------- Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.9% (2995 of 3222 strings)
[CI skip]
Commit: 19ff79489304ed946f72d211c091a2b5591cae44 https://github.com/phpmyadmin/phpmyadmin/commit/19ff79489304ed946f72d211c091... Author: Michal Čihař michal@cihar.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M po/cs.po
Log Message: ----------- Translated using Weblate (Czech)
Currently translated at 93.8% (3024 of 3222 strings)
[CI skip]
Commit: 2e8c8af9b8af8b93f0052bdc1774197250f69039 https://github.com/phpmyadmin/phpmyadmin/commit/2e8c8af9b8af8b93f0052bdc1774... Author: dingo thirteen dingo13@gmail.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M po/nl.po
Log Message: ----------- Translated using Weblate (Dutch)
Currently translated at 100.0% (3222 of 3222 strings)
[CI skip]
Commit: a950a5952bc3f41be233dfa6df5124e0655f1b2f https://github.com/phpmyadmin/phpmyadmin/commit/a950a5952bc3f41be233dfa6df51... Author: Michal Čihař michal@cihar.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M po/de.po
Log Message: ----------- Translated using Weblate (German)
Currently translated at 99.5% (3206 of 3222 strings)
[CI skip]
Commit: a5f9c0273be7343174c66009f0a1745917c59ad6 https://github.com/phpmyadmin/phpmyadmin/commit/a5f9c0273be7343174c66009f0a1... Author: Daniel Miloca danielmiloca@gmail.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M po/pt_BR.po
Log Message: ----------- Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.0% (2997 of 3222 strings)
[CI skip]
Commit: 63eaa362e92ca025b0de2dcab02351abd7558225 https://github.com/phpmyadmin/phpmyadmin/commit/63eaa362e92ca025b0de2dcab023... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-12-21 (Wed, 21 Dec 2016)
Changed paths: M libraries/replication_gui.lib.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M test/libraries/PMA_server_replication_test.php
Log Message: ----------- Fix incorrect comma in message string
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: 1fb040a1df77afd8059683b29fd09c6e17a8d6e6 https://github.com/phpmyadmin/phpmyadmin/commit/1fb040a1df77afd8059683b29fd0... Author: Michal Čihař michal@cihar.com Date: 2016-12-22 (Thu, 22 Dec 2016)
Changed paths: M ChangeLog M libraries/Table.php
Log Message: ----------- Fixed editing of virtual columns
Fixes #12847
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 9ebdb20eb59a26f30ebffca57335d657446753ad https://github.com/phpmyadmin/phpmyadmin/commit/9ebdb20eb59a26f30ebffca57335... Author: Giovanni Sora g.sora@tiscali.it Date: 2016-12-22 (Thu, 22 Dec 2016)
Changed paths: M po/ia.po
Log Message: ----------- Translated using Weblate (Interlingua)
Currently translated at 75.5% (2434 of 3222 strings)
[CI skip]
Commit: 066b71535f45f68978aead5951d0987f4e14e9b4 https://github.com/phpmyadmin/phpmyadmin/commit/066b71535f45f68978aead5951d0... Author: Daniel Miloca danielmiloca@gmail.com Date: 2016-12-22 (Thu, 22 Dec 2016)
Changed paths: M po/pt_BR.po
Log Message: ----------- Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.0% (2999 of 3222 strings)
[CI skip]
Commit: 671d82f8cc764b933e587d52d8db5c7b817dcdaa https://github.com/phpmyadmin/phpmyadmin/commit/671d82f8cc764b933e587d52d8db... Author: Oasisone Doe oasisontherun@gmail.com Date: 2016-12-22 (Thu, 22 Dec 2016)
Changed paths: M po/ro.po
Log Message: ----------- Translated using Weblate (Romanian)
Currently translated at 53.6% (1729 of 3222 strings)
[CI skip]
Commit: 401a18464edb691e8fb9ba8a54e697917bf4484f https://github.com/phpmyadmin/phpmyadmin/commit/401a18464edb691e8fb9ba8a54e6... Author: Weblate noreply@weblate.org Date: 2016-12-22 (Thu, 22 Dec 2016)
Changed paths: M ChangeLog M libraries/Table.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: bba609050e6562e019814dce468f6b25547a602f https://github.com/phpmyadmin/phpmyadmin/commit/bba609050e6562e019814dce468f... Author: Michal Čihař michal@cihar.com Date: 2016-12-22 (Thu, 22 Dec 2016)
Changed paths: M po/ro.po
Log Message: ----------- Translated using Weblate (Romanian)
Currently translated at 53.6% (1729 of 3222 strings)
[CI skip]
Commit: b4dbefc2ffd9b9621a988cf4f2277638b06005c9 https://github.com/phpmyadmin/phpmyadmin/commit/b4dbefc2ffd9b9621a988cf4f227... Author: Marco Filipe Ferreira Fidalgo mardalgo@gmail.com Date: 2016-12-24 (Sat, 24 Dec 2016)
Changed paths: M po/pt.po
Log Message: ----------- Translated using Weblate (Portuguese)
Currently translated at 53.5% (1726 of 3222 strings)
[CI skip]
Commit: c8c317672d9bd822d7c84795800b1d52c1da615f https://github.com/phpmyadmin/phpmyadmin/commit/c8c317672d9bd822d7c84795800b... Author: ctyzxx ctyzxx@126.com Date: 2016-12-26 (Mon, 26 Dec 2016)
Changed paths: M po/zh_CN.po
Log Message: ----------- Translated using Weblate (Chinese (China))
Currently translated at 87.5% (2820 of 3222 strings)
[CI skip]
Commit: 95c1ea129f6ef7f4ae0479243e1f0fb9f5f104c3 https://github.com/phpmyadmin/phpmyadmin/commit/95c1ea129f6ef7f4ae0479243e1f... Author: Kristjan Räts kristjanrats@gmail.com Date: 2016-12-26 (Mon, 26 Dec 2016)
Changed paths: M po/et.po
Log Message: ----------- Translated using Weblate (Estonian)
Currently translated at 100.0% (3222 of 3222 strings)
[CI skip]
Commit: 41a7bad38d0e92b3fcbd04402950a2aca43462a1 https://github.com/phpmyadmin/phpmyadmin/commit/41a7bad38d0e92b3fcbd04402950... Author: Lari Oesch lari@oesch.me Date: 2016-12-27 (Tue, 27 Dec 2016)
Changed paths: M po/fi.po
Log Message: ----------- Translated using Weblate (Finnish)
Currently translated at 69.1% (2228 of 3222 strings)
[CI skip]
Commit: bdb339d2546ceccd40d4555537e1d9326df386e7 https://github.com/phpmyadmin/phpmyadmin/commit/bdb339d2546ceccd40d4555537e1... Author: Elias Kosunen elias.kosunen@gmail.com Date: 2016-12-27 (Tue, 27 Dec 2016)
Changed paths: M po/fi.po
Log Message: ----------- Translated using Weblate (Finnish)
Currently translated at 69.1% (2228 of 3222 strings)
[CI skip]
Commit: 60061f82abfd5383cd33773285327c72567ce9b6 https://github.com/phpmyadmin/phpmyadmin/commit/60061f82abfd5383cd3377328532... Author: Lari Oesch lari@oesch.me Date: 2016-12-27 (Tue, 27 Dec 2016)
Changed paths: M po/fi.po
Log Message: ----------- Translated using Weblate (Finnish)
Currently translated at 69.1% (2228 of 3222 strings)
[CI skip]
Commit: b8c26b74ac6a6d7370b731914fd07b833150db51 https://github.com/phpmyadmin/phpmyadmin/commit/b8c26b74ac6a6d7370b731914fd0... Author: Fujiwara Software fujiwara@diskcatalogmaker.com Date: 2016-12-27 (Tue, 27 Dec 2016)
Changed paths: M po/ja.po
Log Message: ----------- Translated using Weblate (Japanese)
Currently translated at 71.7% (2311 of 3222 strings)
[CI skip]
Commit: a1e46e37b4e2f061136fee67150d75a5877be0f5 https://github.com/phpmyadmin/phpmyadmin/commit/a1e46e37b4e2f061136fee67150d... Author: SD SkyKlouD koongchi135@gmail.com Date: 2016-12-28 (Wed, 28 Dec 2016)
Changed paths: M po/ko.po
Log Message: ----------- Translated using Weblate (Korean)
Currently translated at 80.6% (2600 of 3222 strings)
[CI skip]
Commit: b923c07c1a66edd07b1948ffc462ae62518e05f8 https://github.com/phpmyadmin/phpmyadmin/commit/b923c07c1a66edd07b1948ffc462... Author: Elias Kosunen elias.kosunen@gmail.com Date: 2016-12-29 (Thu, 29 Dec 2016)
Changed paths: M po/fi.po
Log Message: ----------- Translated using Weblate (Finnish)
Currently translated at 69.1% (2228 of 3222 strings)
[CI skip]
Commit: ead6de8a2ac5a0413d8fbfeadaf5a7cd0a30997a https://github.com/phpmyadmin/phpmyadmin/commit/ead6de8a2ac5a0413d8fbfeadaf5... Author: Marc Delisle marc@infomarc.info Date: 2016-12-29 (Thu, 29 Dec 2016)
Changed paths: M po/fr.po
Log Message: ----------- Translated using Weblate (French)
Currently translated at 100.0% (3222 of 3222 strings)
[CI skip]
Commit: ef1473a08199f61d530a9eaf80e97ad4a386e6fc https://github.com/phpmyadmin/phpmyadmin/commit/ef1473a08199f61d530a9eaf80e9... Author: Fujiwara Software fujisoft@gmail.com Date: 2016-12-29 (Thu, 29 Dec 2016)
Changed paths: M po/ja.po
Log Message: ----------- Translated using Weblate (Japanese)
Currently translated at 71.9% (2319 of 3222 strings)
[CI skip]
Commit: 6316a71595015ffaa377ddc9c2bf086c1bd43141 https://github.com/phpmyadmin/phpmyadmin/commit/6316a71595015ffaa377ddc9c2bf... Author: Marek Skiba github@pjona.net Date: 2016-12-31 (Sat, 31 Dec 2016)
Changed paths: M po/pl.po
Log Message: ----------- Translated using Weblate (Polish)
Currently translated at 81.8% (2638 of 3222 strings)
[CI skip]
Commit: 6a0d330718af5441c59e7d1ab36269fba7d93ed1 https://github.com/phpmyadmin/phpmyadmin/commit/6a0d330718af5441c59e7d1ab362... Author: Rodrigo Felix cuca.baratas@hotmail.com Date: 2016-12-31 (Sat, 31 Dec 2016)
Changed paths: M po/pt.po
Log Message: ----------- Translated using Weblate (Portuguese)
Currently translated at 53.6% (1728 of 3222 strings)
[CI skip]
Commit: d018add94b066c8c18fa39110e92e18d875eb09c https://github.com/phpmyadmin/phpmyadmin/commit/d018add94b066c8c18fa39110e92... Author: Michal Čihař michal@cihar.com Date: 2017-01-02 (Mon, 02 Jan 2017)
Changed paths: M libraries/dbi/DBIMysqli.php
Log Message: ----------- Set MySQL SSL parameters even if key is not set
User might want to set any of the SSL parameters without needing to set the key.
Fixes #12293
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 5f36fa56c471a1fab3b3a12dcf10efc9fcff9c72 https://github.com/phpmyadmin/phpmyadmin/commit/5f36fa56c471a1fab3b3a12dcf10... Author: Michal Čihař michal@cihar.com Date: 2017-01-02 (Mon, 02 Jan 2017)
Log Message: ----------- Merge remote-tracking branch 'origin/MAINT_4_6_5' into QA_4_6
Commit: 0376e599f0a4bca96abcea495fc4da353540f0ca https://github.com/phpmyadmin/phpmyadmin/commit/0376e599f0a4bca96abcea495fc4... Author: Michal Čihař michal@cihar.com Date: 2017-01-02 (Mon, 02 Jan 2017)
Changed paths: M libraries/replication_gui.lib.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M test/libraries/PMA_server_replication_test.php
Log Message: ----------- Merge pull request #12853 from ibennetch/commatypo
Fix incorrect comma in message string
Commit: 9b7f4f74e9c70ff95a44a2e54dcc00b574a2fa56 https://github.com/phpmyadmin/phpmyadmin/commit/9b7f4f74e9c70ff95a44a2e54dcc... Author: Vinicius Veroneze veroneze@gmail.com Date: 2017-01-03 (Tue, 03 Jan 2017)
Changed paths: M po/pt_BR.po
Log Message: ----------- Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.3% (3008 of 3222 strings)
[CI skip]
Commit: 16fba839bbab158fdcdb16dd2514ebfb476aabee https://github.com/phpmyadmin/phpmyadmin/commit/16fba839bbab158fdcdb16dd2514... Author: Isaac Bennetch bennetch@gmail.com Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths: M ChangeLog M js/functions.js
Log Message: ----------- Changed the SQL window suggestion tool to have DELETE...WHERE 0 instead of 1. This should help avoid accidental data loss.
Issue #12859
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: 3a4ed9ac454ab0d9beed25aea7e6c0f850acc4b3 https://github.com/phpmyadmin/phpmyadmin/commit/3a4ed9ac454ab0d9beed25aea7e6... Author: Dadan Setia da2n_s@yahoo.co.id Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths: M po/id.po
Log Message: ----------- Translated using Weblate (Indonesian)
Currently translated at 69.6% (2245 of 3222 strings)
[CI skip]
Commit: 48d584794dbd17a619ab7f196f490469ce033cdd https://github.com/phpmyadmin/phpmyadmin/commit/48d584794dbd17a619ab7f196f49... Author: Daniel Palmeira Huanca daniel46758@hotmail.com Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths: M po/pt_BR.po
Log Message: ----------- Translated using Weblate (Portuguese (Brazil))
Currently translated at 94.5% (3048 of 3222 strings)
[CI skip]
Commit: ae34ebc9299876964d34c781e1964aeb41567e37 https://github.com/phpmyadmin/phpmyadmin/commit/ae34ebc9299876964d34c781e196... Author: Flavius Nopcea domnulnopcea@gmail.com Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths: M po/ro.po
Log Message: ----------- Translated using Weblate (Romanian)
Currently translated at 53.6% (1729 of 3222 strings)
[CI skip]
Commit: 5c7f0cc7ac24e4f17272bcf08e942422713a0365 https://github.com/phpmyadmin/phpmyadmin/commit/5c7f0cc7ac24e4f17272bcf08e94... Author: Weblate noreply@weblate.org Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths: M ChangeLog M js/functions.js
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 737cfafb927904524b52bc101e4c6d500030deb7 https://github.com/phpmyadmin/phpmyadmin/commit/737cfafb927904524b52bc101e4c... Author: Mateusz Wasik morwa666@gmail.com Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths: M po/pl.po
Log Message: ----------- Translated using Weblate (Polish)
Currently translated at 82.8% (2669 of 3222 strings)
[CI skip]
Commit: 03cc2253033687e7f1bcf5d53a838b487486f06d https://github.com/phpmyadmin/phpmyadmin/commit/03cc2253033687e7f1bcf5d53a83... Author: Flavius Nopcea domnulnopcea@gmail.com Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths: M po/ro.po
Log Message: ----------- Translated using Weblate (Romanian)
Currently translated at 53.7% (1732 of 3222 strings)
[CI skip]
Commit: 8efea217ff1236a02e5565dcd7d387f4ef309cd4 https://github.com/phpmyadmin/phpmyadmin/commit/8efea217ff1236a02e5565dcd7d3... Author: Michal Čihař michal@cihar.com Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths: M ChangeLog M libraries/Index.php
Log Message: ----------- Use same query for display and execution when dropping index
Fixes #12872
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 681e9089912ee168a92ce6644a1f5e7790497a19 https://github.com/phpmyadmin/phpmyadmin/commit/681e9089912ee168a92ce6644a1f... Author: Michal Čihař michal@cihar.com Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths: M ChangeLog M libraries/server_privileges.lib.php
Log Message: ----------- Fix check for user groups freatures being enabled
Fixes #12868
Signed-off-by: Michal Čihař michal@cihar.com
Commit: fee3923f488e34ce4e9d93c01ba2006c10add4b7 https://github.com/phpmyadmin/phpmyadmin/commit/fee3923f488e34ce4e9d93c01ba2... Author: Michal Čihař michal@cihar.com Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths: M libraries/sql-parser/src/Component.php M libraries/sql-parser/src/Components/AlterOperation.php M libraries/sql-parser/src/Components/Array2d.php M libraries/sql-parser/src/Components/ArrayObj.php M libraries/sql-parser/src/Components/CaseExpression.php M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/DataType.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Components/FunctionCall.php M libraries/sql-parser/src/Components/IntoKeyword.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/Key.php M libraries/sql-parser/src/Components/Limit.php M libraries/sql-parser/src/Components/OptionsArray.php M libraries/sql-parser/src/Components/OrderKeyword.php M libraries/sql-parser/src/Components/ParameterDefinition.php M libraries/sql-parser/src/Components/PartitionDefinition.php M libraries/sql-parser/src/Components/Reference.php M libraries/sql-parser/src/Components/RenameOperation.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Components/UnionKeyword.php M libraries/sql-parser/src/Context.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Exceptions/LexerException.php M libraries/sql-parser/src/Exceptions/ParserException.php M libraries/sql-parser/src/Lexer.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/AlterStatement.php M libraries/sql-parser/src/Statements/AnalyzeStatement.php M libraries/sql-parser/src/Statements/BackupStatement.php M libraries/sql-parser/src/Statements/CallStatement.php M libraries/sql-parser/src/Statements/CheckStatement.php M libraries/sql-parser/src/Statements/ChecksumStatement.php M libraries/sql-parser/src/Statements/CreateStatement.php M libraries/sql-parser/src/Statements/DeleteStatement.php M libraries/sql-parser/src/Statements/DropStatement.php M libraries/sql-parser/src/Statements/ExplainStatement.php M libraries/sql-parser/src/Statements/InsertStatement.php M libraries/sql-parser/src/Statements/MaintenanceStatement.php M libraries/sql-parser/src/Statements/NotImplementedStatement.php M libraries/sql-parser/src/Statements/OptimizeStatement.php M libraries/sql-parser/src/Statements/RenameStatement.php M libraries/sql-parser/src/Statements/RepairStatement.php M libraries/sql-parser/src/Statements/ReplaceStatement.php M libraries/sql-parser/src/Statements/RestoreStatement.php M libraries/sql-parser/src/Statements/SelectStatement.php M libraries/sql-parser/src/Statements/SetStatement.php M libraries/sql-parser/src/Statements/ShowStatement.php M libraries/sql-parser/src/Statements/TransactionStatement.php M libraries/sql-parser/src/Statements/TruncateStatement.php M libraries/sql-parser/src/Statements/UpdateStatement.php M libraries/sql-parser/src/Token.php M libraries/sql-parser/src/TokensList.php M libraries/sql-parser/src/UtfString.php M libraries/sql-parser/src/Utils/BufferedQuery.php M libraries/sql-parser/src/Utils/CLI.php M libraries/sql-parser/src/Utils/Error.php M libraries/sql-parser/src/Utils/Formatter.php M libraries/sql-parser/src/Utils/Misc.php M libraries/sql-parser/src/Utils/Query.php M libraries/sql-parser/src/Utils/Routine.php M libraries/sql-parser/src/Utils/Table.php M libraries/sql-parser/src/Utils/Tokens.php M libraries/sql-parser/src/common.php
Log Message: ----------- Update SQL parser to 3.4.16
* Coding style fixes. * Properly handle operators AND, NOT, OR, XOR, DIV, MOD
Signed-off-by: Michal Čihař michal@cihar.com
Commit: cbcf740adbad341c05705de6506908f41a24fbcf https://github.com/phpmyadmin/phpmyadmin/commit/cbcf740adbad341c05705de65069... Author: Michal Čihař michal@cihar.com Date: 2017-01-07 (Sat, 07 Jan 2017)
Changed paths: M ChangeLog M js/functions.js M libraries/Index.php M libraries/Table.php M libraries/dbi/DBIMysqli.php M libraries/replication_gui.lib.php M libraries/server_privileges.lib.php M libraries/sql-parser/src/Component.php M libraries/sql-parser/src/Components/AlterOperation.php M libraries/sql-parser/src/Components/Array2d.php M libraries/sql-parser/src/Components/ArrayObj.php M libraries/sql-parser/src/Components/CaseExpression.php M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/DataType.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Components/FunctionCall.php M libraries/sql-parser/src/Components/IntoKeyword.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/Key.php M libraries/sql-parser/src/Components/Limit.php M libraries/sql-parser/src/Components/OptionsArray.php M libraries/sql-parser/src/Components/OrderKeyword.php M libraries/sql-parser/src/Components/ParameterDefinition.php M libraries/sql-parser/src/Components/PartitionDefinition.php M libraries/sql-parser/src/Components/Reference.php M libraries/sql-parser/src/Components/RenameOperation.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Components/UnionKeyword.php M libraries/sql-parser/src/Context.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Exceptions/LexerException.php M libraries/sql-parser/src/Exceptions/ParserException.php M libraries/sql-parser/src/Lexer.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/AlterStatement.php M libraries/sql-parser/src/Statements/AnalyzeStatement.php M libraries/sql-parser/src/Statements/BackupStatement.php M libraries/sql-parser/src/Statements/CallStatement.php M libraries/sql-parser/src/Statements/CheckStatement.php M libraries/sql-parser/src/Statements/ChecksumStatement.php M libraries/sql-parser/src/Statements/CreateStatement.php M libraries/sql-parser/src/Statements/DeleteStatement.php M libraries/sql-parser/src/Statements/DropStatement.php M libraries/sql-parser/src/Statements/ExplainStatement.php M libraries/sql-parser/src/Statements/InsertStatement.php M libraries/sql-parser/src/Statements/MaintenanceStatement.php M libraries/sql-parser/src/Statements/NotImplementedStatement.php M libraries/sql-parser/src/Statements/OptimizeStatement.php M libraries/sql-parser/src/Statements/RenameStatement.php M libraries/sql-parser/src/Statements/RepairStatement.php M libraries/sql-parser/src/Statements/ReplaceStatement.php M libraries/sql-parser/src/Statements/RestoreStatement.php M libraries/sql-parser/src/Statements/SelectStatement.php M libraries/sql-parser/src/Statements/SetStatement.php M libraries/sql-parser/src/Statements/ShowStatement.php M libraries/sql-parser/src/Statements/TransactionStatement.php M libraries/sql-parser/src/Statements/TruncateStatement.php M libraries/sql-parser/src/Statements/UpdateStatement.php M libraries/sql-parser/src/Token.php M libraries/sql-parser/src/TokensList.php M libraries/sql-parser/src/UtfString.php M libraries/sql-parser/src/Utils/BufferedQuery.php M libraries/sql-parser/src/Utils/CLI.php M libraries/sql-parser/src/Utils/Error.php M libraries/sql-parser/src/Utils/Formatter.php M libraries/sql-parser/src/Utils/Misc.php M libraries/sql-parser/src/Utils/Query.php M libraries/sql-parser/src/Utils/Routine.php M libraries/sql-parser/src/Utils/Table.php M libraries/sql-parser/src/Utils/Tokens.php M libraries/sql-parser/src/common.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M test/libraries/PMA_server_replication_test.php
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: 93e354c2e33347a138234d236b2e987a7f092b14 https://github.com/phpmyadmin/phpmyadmin/commit/93e354c2e33347a138234d236b2e... Author: Michal Čihař michal@cihar.com Date: 2017-01-07 (Sat, 07 Jan 2017)
Changed paths: M doc/config.rst M index.php M libraries/common.inc.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php A phpinfo.php
Log Message: ----------- Revert "Remove option to show phpinfo() ($cfg['ShowPhpInfo'])"
This reverts commit e67e69229a1df3a26df12b1bae89065834fd85b4.
Commit: 1089a7d67e39f9017ae96c92b922f89648dff240 https://github.com/phpmyadmin/phpmyadmin/commit/1089a7d67e39f9017ae96c92b922... Author: Michal Čihař michal@cihar.com Date: 2017-01-07 (Sat, 07 Jan 2017)
Changed paths: M phpinfo.php
Log Message: ----------- Limit what we display in phpinfo
- general information - configuration - modules
This way we avoid displaying sensitive things (such as httpOnly cookies from environment of variables).
Signed-off-by: Michal Čihař michal@cihar.com
Commit: fdbef2dcc8e027155e3e5f3af8e460482830c9e0 https://github.com/phpmyadmin/phpmyadmin/commit/fdbef2dcc8e027155e3e5f3af8e4... Author: Michal Čihař michal@cihar.com Date: 2017-01-07 (Sat, 07 Jan 2017)
Changed paths: M doc/config.rst
Log Message: ----------- Add warning about enabling phpinfo
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 4abbe78a071d46283c5db485f38d8db691322e18 https://github.com/phpmyadmin/phpmyadmin/commit/4abbe78a071d46283c5db485f38d... Author: Michal Čihař michal@cihar.com Date: 2017-01-07 (Sat, 07 Jan 2017)
Changed paths: M libraries/common.inc.php
Log Message: ----------- Remove unused entries from goto whitelist
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 95956f011d34b9a11197ba2ef098172cb418f7ba https://github.com/phpmyadmin/phpmyadmin/commit/95956f011d34b9a11197ba2ef098... Author: Yungu Kim crimsonpi@gmail.com Date: 2017-01-09 (Mon, 09 Jan 2017)
Changed paths: M po/ko.po
Log Message: ----------- Translated using Weblate (Korean)
Currently translated at 81.1% (2616 of 3222 strings)
[CI skip]
Commit: 3b07b39c352437bf685b55b9011c565d463b8a34 https://github.com/phpmyadmin/phpmyadmin/commit/3b07b39c352437bf685b55b9011c... Author: Tim McLaughlin tim.j.mclaughlin@gmail.com Date: 2017-01-09 (Mon, 09 Jan 2017)
Changed paths: M ChangeLog M tbl_operations.php
Log Message: ----------- Fix PHP Notice 'Undefined index: row_format' when altering table options. Issue #12840 Signed-off-by: Tim McLaughlin tim.j.mclaughlin@gmail.com
Commit: bef006a92acae59fff893d57831eb0db761efd2b https://github.com/phpmyadmin/phpmyadmin/commit/bef006a92acae59fff893d57831e... Author: Tim McLaughlin tim.j.mclaughlin@gmail.com Date: 2017-01-09 (Mon, 09 Jan 2017)
Changed paths: M ChangeLog M libraries/navigation/NavigationTree.php
Log Message: ----------- Fix PHP notices and warning related to dbs_to_test global. Issue #12876 Signed-off-by: Tim McLaughlin tim.j.mclaughlin@gmail.com
Commit: 4ab34edba6a14dfdad988310a88e1b3770c6ab64 https://github.com/phpmyadmin/phpmyadmin/commit/4ab34edba6a14dfdad988310a88e... Author: Michal Čihař michal@cihar.com Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths: M libraries/php-gettext/gettext.php
Log Message: ----------- Merge changes from php-gettext 1.0.12
This ensures that parameter to select_string is numeric, avoiding code injection through it.
Our code is not vulnerable as we do not pass user supplied values to this function, this fix is included only to be closer to upstream.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 4233fbc874ce19b8efe750535e9b1d0e11056005 https://github.com/phpmyadmin/phpmyadmin/commit/4233fbc874ce19b8efe750535e9b... Author: Manuela Silva manuela.silva@sky.com Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths: M po/pt.po
Log Message: ----------- Translated using Weblate (Portuguese)
Currently translated at 53.9% (1738 of 3222 strings)
[CI skip]
Commit: a0e0eea03de90f9f7efd48a38740f3db27a0ebf4 https://github.com/phpmyadmin/phpmyadmin/commit/a0e0eea03de90f9f7efd48a38740... Author: Ariel Alonso arielmontessinobarbosa@gmail.com Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths: M po/pt_BR.po
Log Message: ----------- Translated using Weblate (Portuguese (Brazil))
Currently translated at 94.6% (3049 of 3222 strings)
[CI skip]
Commit: a5d677115e9ba308bdbe23cda31c4ca59d45cc35 https://github.com/phpmyadmin/phpmyadmin/commit/a5d677115e9ba308bdbe23cda31c... Author: Michal Čihař michal@cihar.com Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths: M po/ko.po M po/pt.po M po/pt_BR.po
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: 4a2695cf5b209d18374ed6c339cefd33abfea15b https://github.com/phpmyadmin/phpmyadmin/commit/4a2695cf5b209d18374ed6c339ce... Author: Shreyas Sinha shreyas.sinha14@gmail.com Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths: M libraries/insert_edit.lib.php
Log Message: ----------- Row coloring issue and incorrect table code Fixes issue #12831
Signed-off-by: Shreyas Sinha shreyas.sinha14@gmail.com
Commit: 986035a716e690174141d6bd6a64d9562faa5fac https://github.com/phpmyadmin/phpmyadmin/commit/986035a716e690174141d6bd6a64... Author: Isaac Bennetch bennetch@gmail.com Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths: M ChangeLog
Log Message: ----------- Add ChangeLog entry for issue 12831
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: e21b4f998e2ce8d7ed67311583e34209d5f3480c https://github.com/phpmyadmin/phpmyadmin/commit/e21b4f998e2ce8d7ed67311583e3... Author: Michal Čihař michal@cihar.com Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths: M doc/config.rst M index.php M libraries/common.inc.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php A phpinfo.php
Log Message: ----------- Merge remote-tracking branch 'origin/pull/12875' into QA_4_6
Commit: eb2898527f44f1b0a397c84247d6fb27a2d8339f https://github.com/phpmyadmin/phpmyadmin/commit/eb2898527f44f1b0a397c84247d6... Author: Michal Čihař michal@cihar.com Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths: M ChangeLog
Log Message: ----------- Changelog entry for #12495 and #12875
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 18d48bb20f29eab510c3b4867f6dba3257b7fe72 https://github.com/phpmyadmin/phpmyadmin/commit/18d48bb20f29eab510c3b4867f6d... Author: Tim McLaughlin tim.j.mclaughlin@gmail.com Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths: M ChangeLog M doc/config.rst M index.php M libraries/common.inc.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/insert_edit.lib.php A phpinfo.php M po/pt.po M po/pt_BR.po
Log Message: ----------- Merge branch 'QA_4_6' into issue_12876_v4
Commit: f1375a26a3c543d28621b7901d0433c0069004ab https://github.com/phpmyadmin/phpmyadmin/commit/f1375a26a3c543d28621b7901d04... Author: Isaac Bennetch bennetch@gmail.com Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths: M libraries/insert_edit.lib.php
Log Message: ----------- Remove dead code related to 4a2695c
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: 575f34953defbbe32dcd2622799b7f6493e70804 https://github.com/phpmyadmin/phpmyadmin/commit/575f34953defbbe32dcd2622799b... Author: Sevdimali İsa sevdimaliisayev@mail.ru Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths: M po/az.po
Log Message: ----------- Translated using Weblate (Azerbaijani)
Currently translated at 53.3% (1718 of 3222 strings)
[CI skip]
Commit: f4c620bcf2d0ca7c6b7510dd289842c4f3efd5a6 https://github.com/phpmyadmin/phpmyadmin/commit/f4c620bcf2d0ca7c6b7510dd2898... Author: Weblate noreply@weblate.org Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths: M libraries/insert_edit.lib.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 3bf78afeca5c4965aa1fef66f2bdf34409e2a2da https://github.com/phpmyadmin/phpmyadmin/commit/3bf78afeca5c4965aa1fef66f2bd... Author: Mike Lewis mike@mplew.is Date: 2017-01-18 (Wed, 18 Jan 2017)
Changed paths: M libraries/Table.php
Log Message: ----------- Only convert table name to lower-case when installation forces it
Issue #12861
A `lower_case_table_names` setting of `2` does not mean that the table needs to be forced to lower-case This preserves case unless the `lower_case_table_names` setting is `1`, implying that lower-case should be forced
Signed-off-by: Mike Lewis mike@mplew.is
Commit: 89357ee0f16b9be36d80d7e5d3d8727923ba2ac0 https://github.com/phpmyadmin/phpmyadmin/commit/89357ee0f16b9be36d80d7e5d3d8... Author: Michal Čihař michal@cihar.com Date: 2017-01-18 (Wed, 18 Jan 2017)
Changed paths: M libraries/Table.php M libraries/operations.lib.php M test/classes/TableTest.php
Log Message: ----------- Share code for getting lower_case_table_names value
Issue #12861
Signed-off-by: Michal Čihař michal@cihar.com
Commit: f1aefb1fa550cebe8f231c4a847c7d4b391524b6 https://github.com/phpmyadmin/phpmyadmin/commit/f1aefb1fa550cebe8f231c4a847c... Author: Michal Čihař michal@cihar.com Date: 2017-01-18 (Wed, 18 Jan 2017)
Changed paths: M ChangeLog
Log Message: ----------- Changelog entry for #12861 and #12891
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 9b96ff3b174b121215c226090b5a2ddecc062c90 https://github.com/phpmyadmin/phpmyadmin/commit/9b96ff3b174b121215c226090b5a... Author: Giovanni Sora g.sora@tiscali.it Date: 2017-01-18 (Wed, 18 Jan 2017)
Changed paths: M po/ia.po
Log Message: ----------- Translated using Weblate (Interlingua)
Currently translated at 75.9% (2447 of 3222 strings)
[CI skip]
Commit: c4bd5dfab45afe1aaf6edcede6108770a76fcc05 https://github.com/phpmyadmin/phpmyadmin/commit/c4bd5dfab45afe1aaf6edcede610... Author: Weblate noreply@weblate.org Date: 2017-01-18 (Wed, 18 Jan 2017)
Changed paths: M ChangeLog M libraries/Table.php M libraries/operations.lib.php M test/classes/TableTest.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 82ae5abef3265d9f56afc075d957b8e07df5ee05 https://github.com/phpmyadmin/phpmyadmin/commit/82ae5abef3265d9f56afc075d957... Author: Michal Čihař michal@cihar.com Date: 2017-01-18 (Wed, 18 Jan 2017)
Changed paths: M ChangeLog M libraries/navigation/NavigationTree.php
Log Message: ----------- Merge pull request #12885 from slimtim/issue_12876_v4
Fix PHP notices and warning related to dbs_to_test global
Commit: 71575e3d49ed57dc701b5ea2d04bbb3de19c2729 https://github.com/phpmyadmin/phpmyadmin/commit/71575e3d49ed57dc701b5ea2d04b... Author: Michal Čihař michal@cihar.com Date: 2017-01-18 (Wed, 18 Jan 2017)
Changed paths: M ChangeLog
Log Message: ----------- Changelog entry for #12876 and #12885
Signed-off-by: Michal Čihař michal@cihar.com
Commit: f2cdfc5d00ef9f3780ac0c596062dda2a8930c64 https://github.com/phpmyadmin/phpmyadmin/commit/f2cdfc5d00ef9f3780ac0c596062... Author: Isaac Bennetch bennetch@gmail.com Date: 2017-01-19 (Thu, 19 Jan 2017)
Changed paths: M ChangeLog M tbl_operations.php
Log Message: ----------- Merge pull request #12884 from slimtim/issue_12840_v2
Fix PHP Notice 'Undefined index: row_format' when altering table options
Commit: 206a59007a085bae7a7c1440a104d2f8a68e2087 https://github.com/phpmyadmin/phpmyadmin/commit/206a59007a085bae7a7c1440a104... Author: Flavio Coelho flavio.coelho.mail@gmail.com Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths: M po/pt.po
Log Message: ----------- Translated using Weblate (Portuguese)
Currently translated at 54.0% (1740 of 3222 strings)
[CI skip]
Commit: 9d3c265adcbf0ef16e13a7b6639bf3b16c39205c https://github.com/phpmyadmin/phpmyadmin/commit/9d3c265adcbf0ef16e13a7b6639b... Author: Weblate noreply@weblate.org Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths: M ChangeLog M tbl_operations.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 827ff5715a4fe8e2d8eee37ad2f759c4f551e5f4 https://github.com/phpmyadmin/phpmyadmin/commit/827ff5715a4fe8e2d8eee37ad2f7... Author: Michal Čihař michal@cihar.com Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths: M ChangeLog M libraries/DbSearch.php
Log Message: ----------- Fix database search with newer php-gettext
We really need integer from count query.
Fixes #12881
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e7928e58ccf1f8e1fa82110a0bb03b5764b61198 https://github.com/phpmyadmin/phpmyadmin/commit/e7928e58ccf1f8e1fa82110a0bb0... Author: Michal Čihař michal@cihar.com Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths: M ChangeLog M libraries/sql-parser/src/Lexer.php M libraries/sql-parser/src/Utils/Formatter.php
Log Message: ----------- Update SQL parser to 3.4.17
Fixes #12894
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 593f71dd238fcca9b1474111b86bb566206a2832 https://github.com/phpmyadmin/phpmyadmin/commit/593f71dd238fcca9b1474111b86b... Author: Michal Čihař michal@cihar.com Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths: M ChangeLog M libraries/server_status_processes.lib.php
Log Message: ----------- Fixed filtering for active processes
There are dozen of process states when executing the query, we can't filter just for one of them. Let's rather exclude those without state and are idling.
See also http://dev.mysql.com/doc/refman/5.7/en/general-thread-states.html
Fixes #12732
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 1e2c24474e94b76a020c52bd107e8aae00336a0b https://github.com/phpmyadmin/phpmyadmin/commit/1e2c24474e94b76a020c52bd107e... Author: Michal Čihař michal@cihar.com Date: 2017-01-21 (Sat, 21 Jan 2017)
Changed paths: M ChangeLog M doc/config.rst M index.php M libraries/DbSearch.php M libraries/Table.php M libraries/common.inc.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/insert_edit.lib.php M libraries/navigation/NavigationTree.php M libraries/operations.lib.php M libraries/server_status_processes.lib.php M libraries/sql-parser/src/Lexer.php M libraries/sql-parser/src/Utils/Formatter.php A phpinfo.php M po/az.po M po/ia.po M po/pt.po M tbl_operations.php M test/classes/TableTest.php
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: 3adb0eb8889ca8d88c72e74b3a20f67db45d749f https://github.com/phpmyadmin/phpmyadmin/commit/3adb0eb8889ca8d88c72e74b3a20... Author: Michal Čihař michal@cihar.com Date: 2017-01-21 (Sat, 21 Jan 2017)
Changed paths: M ChangeLog
Log Message: ----------- Add changelog entries for security fixes
Signed-off-by: Michal Čihař michal@cihar.com
Commit: d06f92de67e4eca0087f587b1c41af19703397c7 https://github.com/phpmyadmin/phpmyadmin/commit/d06f92de67e4eca0087f587b1c41... Author: Daniel Heße hesse.daniel93@gmail.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M po/de.po
Log Message: ----------- Translated using Weblate (German)
Currently translated at 99.7% (3213 of 3222 strings)
[CI skip]
Commit: c654a50d87a725f9dabbb97326a2b7855b8254ec https://github.com/phpmyadmin/phpmyadmin/commit/c654a50d87a725f9dabbb97326a2... Author: Kurt Eilertsen kurt@kheds.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M po/nb.po
Log Message: ----------- Translated using Weblate (Norwegian Bokmål)
Currently translated at 57.4% (1851 of 3222 strings)
[CI skip]
Commit: 193323bb7cfc7ed3994a409adaba1e1976675e97 https://github.com/phpmyadmin/phpmyadmin/commit/193323bb7cfc7ed3994a409adaba... Author: Michal Čihař michal@cihar.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po
Log Message: ----------- Update po files
[CI skip]
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 1db25d644758ae5841db9e8ae06f8c8b799ec48f https://github.com/phpmyadmin/phpmyadmin/commit/1db25d644758ae5841db9e8ae06f... Author: Michal Čihař michal@cihar.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po
Log Message: ----------- Merge branch 'QA_4_6' into QA_4_6-security
Commit: d121c692265078fb75b19e9b1f6eb49aae54c9ab https://github.com/phpmyadmin/phpmyadmin/commit/d121c692265078fb75b19e9b1f6e... Author: Burak Yavuz hitowerdigit@hotmail.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M po/tr.po
Log Message: ----------- Translated using Weblate (Turkish)
Currently translated at 100.0% (3226 of 3226 strings)
[CI skip]
Commit: 18f18af84822f22d04d7f1c52395bd1e26643b46 https://github.com/phpmyadmin/phpmyadmin/commit/18f18af84822f22d04d7f1c52395... Author: Domen mitenem@outlook.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M po/sl.po
Log Message: ----------- Translated using Weblate (Slovenian)
Currently translated at 100.0% (3226 of 3226 strings)
[CI skip]
Commit: 3087a889567ecf547ac98f6c7668c67a1153f3af https://github.com/phpmyadmin/phpmyadmin/commit/3087a889567ecf547ac98f6c7668... Author: Isaac Bennetch bennetch@gmail.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M ChangeLog M doc/setup.rst M libraries/Theme.php M libraries/config/ConfigFile.php M libraries/config/PageSettings.php M libraries/controllers/database/DatabaseStructureController.php M libraries/core.lib.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/php-gettext/gettext.php M libraries/replication_gui.lib.php M libraries/vendor_config.php M setup/config.php M setup/frames/config.inc.php M setup/frames/index.inc.php M setup/index.php M setup/lib/index.lib.php M tbl_replace.php M templates/navigation/logo.phtml M test/classes/config/ConfigFileTest.php M test/libraries/PMA_SetupIndex_test.php M test/libraries/core/PMA_cleanupPathInfo_test.php
Log Message: ----------- Merge remote-tracking branch 'security/QA_4_6-security' into QA_4_6
Commit: c812bcd4112c3d44e6e6bc72e710b9935c6aa9d3 https://github.com/phpmyadmin/phpmyadmin/commit/c812bcd4112c3d44e6e6bc72e710... Author: Isaac Bennetch bennetch@gmail.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php
Log Message: ----------- Prepare for 4.6.6 release
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: e785275f7cf6c0c9bed55f2dcc4a5bbe4ea980a7 https://github.com/phpmyadmin/phpmyadmin/commit/e785275f7cf6c0c9bed55f2dcc4a... Author: Isaac Bennetch bennetch@gmail.com Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths: M .travis.yml M ChangeLog M README M composer.json M doc/conf.py M doc/config.rst M doc/credits.rst M doc/faq.rst M doc/glossary.rst M doc/require.rst M doc/setup.rst M index.php M js/config.js M js/functions.js M js/rte.js M js/tbl_structure.js M js/tracekit/tracekit.js M libraries/Config.php M libraries/DatabaseInterface.php M libraries/DbSearch.php M libraries/Footer.php M libraries/Header.php M libraries/Index.php M libraries/SysInfoLinux.php M libraries/Table.php M libraries/Theme.php M libraries/Util.php M libraries/common.inc.php M libraries/config.default.php M libraries/config/ConfigFile.php M libraries/config/PageSettings.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/controllers/database/DatabaseStructureController.php M libraries/controllers/table/TableStructureController.php M libraries/core.lib.php M libraries/dbi/DBIMysqli.php M libraries/gis/GISVisualization.php M libraries/insert_edit.lib.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/operations.lib.php M libraries/php-gettext/gettext.php M libraries/phpseclib/Crypt/Base.php M libraries/phpseclib/Crypt/Random.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php M libraries/plugins/schema/svg/Svg.php M libraries/plugins/schema/svg/SvgRelationSchema.php M libraries/pmd_common.php M libraries/replication_gui.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/server_privileges.lib.php M libraries/server_status_processes.lib.php M libraries/sql-parser/src/Component.php M libraries/sql-parser/src/Components/AlterOperation.php M libraries/sql-parser/src/Components/Array2d.php M libraries/sql-parser/src/Components/ArrayObj.php M libraries/sql-parser/src/Components/CaseExpression.php M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/DataType.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Components/FunctionCall.php M libraries/sql-parser/src/Components/IntoKeyword.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/Key.php M libraries/sql-parser/src/Components/Limit.php M libraries/sql-parser/src/Components/OptionsArray.php M libraries/sql-parser/src/Components/OrderKeyword.php M libraries/sql-parser/src/Components/ParameterDefinition.php M libraries/sql-parser/src/Components/PartitionDefinition.php M libraries/sql-parser/src/Components/Reference.php M libraries/sql-parser/src/Components/RenameOperation.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Components/UnionKeyword.php M libraries/sql-parser/src/Context.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Exceptions/LexerException.php M libraries/sql-parser/src/Exceptions/ParserException.php M libraries/sql-parser/src/Lexer.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/AlterStatement.php M libraries/sql-parser/src/Statements/AnalyzeStatement.php M libraries/sql-parser/src/Statements/BackupStatement.php M libraries/sql-parser/src/Statements/CallStatement.php M libraries/sql-parser/src/Statements/CheckStatement.php M libraries/sql-parser/src/Statements/ChecksumStatement.php M libraries/sql-parser/src/Statements/CreateStatement.php M libraries/sql-parser/src/Statements/DeleteStatement.php M libraries/sql-parser/src/Statements/DropStatement.php M libraries/sql-parser/src/Statements/ExplainStatement.php M libraries/sql-parser/src/Statements/InsertStatement.php M libraries/sql-parser/src/Statements/MaintenanceStatement.php M libraries/sql-parser/src/Statements/NotImplementedStatement.php M libraries/sql-parser/src/Statements/OptimizeStatement.php M libraries/sql-parser/src/Statements/RenameStatement.php M libraries/sql-parser/src/Statements/RepairStatement.php M libraries/sql-parser/src/Statements/ReplaceStatement.php M libraries/sql-parser/src/Statements/RestoreStatement.php M libraries/sql-parser/src/Statements/SelectStatement.php M libraries/sql-parser/src/Statements/SetStatement.php M libraries/sql-parser/src/Statements/ShowStatement.php M libraries/sql-parser/src/Statements/TransactionStatement.php M libraries/sql-parser/src/Statements/TruncateStatement.php M libraries/sql-parser/src/Statements/UpdateStatement.php M libraries/sql-parser/src/Token.php M libraries/sql-parser/src/TokensList.php M libraries/sql-parser/src/UtfString.php M libraries/sql-parser/src/Utils/BufferedQuery.php M libraries/sql-parser/src/Utils/CLI.php M libraries/sql-parser/src/Utils/Error.php M libraries/sql-parser/src/Utils/Formatter.php M libraries/sql-parser/src/Utils/Misc.php M libraries/sql-parser/src/Utils/Query.php M libraries/sql-parser/src/Utils/Routine.php M libraries/sql-parser/src/Utils/Table.php M libraries/sql-parser/src/Utils/Tokens.php M libraries/sql-parser/src/common.php M libraries/vendor_config.php A phpinfo.php M phpunit.xml.dist M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M scripts/create-release.sh M scripts/generate-mo M scripts/generate-sprites M scripts/lang-cleanup.sh M scripts/line-counts.sh M scripts/locales-contributors M scripts/remove-incomplete-mo M scripts/transformations_generator_main_class.sh M scripts/transformations_generator_plugin.sh M scripts/update-po M scripts/upload-release M setup/config.php M setup/frames/config.inc.php M setup/frames/index.inc.php M setup/index.php M setup/lib/index.lib.php M setup/scripts.js M tbl_operations.php M tbl_replace.php M templates/database/designer/database_tables.phtml M templates/database/designer/table_list.phtml M templates/header_location.phtml M templates/navigation/logo.phtml R test/.htaccess M test/bootstrap-dist.php M test/classes/ConfigTest.php M test/classes/LanguageTest.php M test/classes/TableTest.php M test/classes/VersionInformationTest.php M test/classes/config/ConfigFileTest.php M test/classes/gis/GISGeometrycollectionTest.php M test/classes/gis/GISLinestringTest.php M test/classes/gis/GISMultilinestringTest.php M test/classes/gis/GISMultipointTest.php M test/classes/gis/GISMultipolygonTest.php M test/classes/gis/GISPointTest.php M test/classes/gis/GISPolygonTest.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/classes/plugin/auth/AuthenticationHttpTest.php M test/classes/plugin/transformations/TransformationPluginsTest.php M test/install-browserstack M test/install-runkit M test/libraries/PMA_SetupIndex_test.php M test/libraries/PMA_server_replication_test.php M test/libraries/PMA_server_status_monitor_test.php M test/libraries/PMA_server_status_queries_test.php M test/libraries/PMA_server_status_test.php M test/libraries/core/PMA_cleanupPathInfo_test.php M test/libraries/core/PMA_headerLocation_test.php M test/libraries/php-gettext/PMA_FileReader_test.php M test/libraries/php-gettext/PMA_StreamReader_test.php M test/libraries/php-gettext/PMA_StringReader_test.php M test/libraries/php-gettext/PMA_gettext_test.php M test/libraries/php-gettext/Parsing_test.php M test/start-local-server
Log Message: ----------- Merge branch 'QA_4_6' into STABLE
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/667a5915a903...e785275f7cf6
-
Isaac Bennetch