Branch: refs/heads/QA_4_6
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: d730db12597ddf99ec7346d1dada59e3200e2421
https://github.com/phpmyadmin/phpmyadmin/commit/d730db12597ddf99ec7346d1dad…
Author: Michal Čihař <michal(a)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(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: b8b872d4499a73cc481090fba888067ffd63cb5c
https://github.com/phpmyadmin/phpmyadmin/commit/b8b872d4499a73cc481090fba88…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-12-19 (Mon, 19 Dec 2016)
Changed paths:
M js/server_privileges.js
Log Message:
-----------
Remove default value for js parameter
The null is there implicitely anyway.
Fixes #12829
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: ffe68c7219eac49ebc7066c732a42c27652a9998
https://github.com/phpmyadmin/phpmyadmin/commit/ffe68c7219eac49ebc7066c732a…
Author: Michal Čihař <michal(a)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(a)cihar.com>
Commit: a856a61c9d62094570ee612efb6aaf475ead62d2
https://github.com/phpmyadmin/phpmyadmin/commit/a856a61c9d62094570ee612efb6…
Author: Michal Čihař <michal(a)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(a)cihar.com>
Commit: 6bf4f3bf39ee7206b1201114eec012e682d3d37f
https://github.com/phpmyadmin/phpmyadmin/commit/6bf4f3bf39ee7206b1201114eec…
Author: Michal Čihař <michal(a)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
M test/classes/plugin/auth/AuthenticationHttpTest.php
Log Message:
-----------
Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9835791bff33...6bf4f3bf39ee
Branch: refs/heads/QA_4_6
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: ffe68c7219eac49ebc7066c732a42c27652a9998
https://github.com/phpmyadmin/phpmyadmin/commit/ffe68c7219eac49ebc7066c732a…
Author: Michal Čihař <michal(a)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(a)cihar.com>
Commit: a856a61c9d62094570ee612efb6aaf475ead62d2
https://github.com/phpmyadmin/phpmyadmin/commit/a856a61c9d62094570ee612efb6…
Author: Michal Čihař <michal(a)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(a)cihar.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/255770994939...a856a61c9d62
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 73499a5e56a5d9fe1f0fa752dd38feee89b1ee65
https://github.com/phpmyadmin/phpmyadmin/commit/73499a5e56a5d9fe1f0fa752dd3…
Author: Michal Čihař <michal(a)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(a)cihar.com>
Commit: 2557709949398c560455b53816f29ea5890c52aa
https://github.com/phpmyadmin/phpmyadmin/commit/2557709949398c560455b53816f…
Author: Michal Čihař <michal(a)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: 3a7eaf8538773378bf13c4599d681d80c1f41764
https://github.com/phpmyadmin/phpmyadmin/commit/3a7eaf8538773378bf13c4599d6…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-12-19 (Mon, 19 Dec 2016)
Changed paths:
M libraries/Util.php
M libraries/core.lib.php
Log Message:
-----------
Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/945e615253a8...3a7eaf853877
Branch: refs/heads/QA_4_6
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 73499a5e56a5d9fe1f0fa752dd38feee89b1ee65
https://github.com/phpmyadmin/phpmyadmin/commit/73499a5e56a5d9fe1f0fa752dd3…
Author: Michal Čihař <michal(a)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(a)cihar.com>
Commit: 2557709949398c560455b53816f29ea5890c52aa
https://github.com/phpmyadmin/phpmyadmin/commit/2557709949398c560455b53816f…
Author: Michal Čihař <michal(a)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
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7d361806c353...255770994939
Branch: refs/heads/QA_4_6
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: e3a4bfe75706225de084681b54c6e5a054bf5814
https://github.com/phpmyadmin/phpmyadmin/commit/e3a4bfe75706225de084681b54c…
Author: Isaac Bennetch <bennetch(a)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(a)gmail.com>
Commit: e267c6f9af2a8a4f9c272e9ad48de94e8c96c036
https://github.com/phpmyadmin/phpmyadmin/commit/e267c6f9af2a8a4f9c272e9ad48…
Author: Michal Čihař <michal(a)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/7d361806c353911b2828053dc2e…
Author: Michal Čihař <michal(a)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(a)cihar.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/53274555b60a...7d361806c353
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: e3a4bfe75706225de084681b54c6e5a054bf5814
https://github.com/phpmyadmin/phpmyadmin/commit/e3a4bfe75706225de084681b54c…
Author: Isaac Bennetch <bennetch(a)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(a)gmail.com>
Commit: e267c6f9af2a8a4f9c272e9ad48de94e8c96c036
https://github.com/phpmyadmin/phpmyadmin/commit/e267c6f9af2a8a4f9c272e9ad48…
Author: Michal Čihař <michal(a)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/7d361806c353911b2828053dc2e…
Author: Michal Čihař <michal(a)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(a)cihar.com>
Commit: 945e615253a8a5370ccfb0f1e1504c9be2b0055a
https://github.com/phpmyadmin/phpmyadmin/commit/945e615253a8a5370ccfb0f1e15…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-12-19 (Mon, 19 Dec 2016)
Changed paths:
M ChangeLog
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:
-----------
Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2fd4e4b2aec9...945e615253a8