Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f5655f4429899c243c2a19b39ebfc778a497995d https://github.com/phpmyadmin/phpmyadmin/commit/f5655f4429899c243c2a19b39ebf... Author: Michal Čihař michal@cihar.com Date: 2017-04-05 (Wed, 05 Apr 2017)

Changed paths: M js/console.js

Log Message: ----------- Do not try to parse error response

Issue #13130

Signed-off-by: Michal Čihař michal@cihar.com

Commit: a079a55282b95f701ec315591149512cc29930b6 https://github.com/phpmyadmin/phpmyadmin/commit/a079a55282b95f701ec315591149... Author: Michal Čihař michal@cihar.com Date: 2017-04-05 (Wed, 05 Apr 2017)

Changed paths: M js/console.js

Log Message: ----------- Remove duplicite error handler

There is already ajaxError in js/ajax.js, we can do handling there.

Issue #13130

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 799ac0d4a0d1d6f2cb393c06e7d85e14dd89fa3a https://github.com/phpmyadmin/phpmyadmin/commit/799ac0d4a0d1d6f2cb393c06e7d8... Author: Michal Čihař michal@cihar.com Date: 2017-04-05 (Wed, 05 Apr 2017)

Changed paths: M ChangeLog M js/ajax.js

Log Message: ----------- Fix condition to ignore aborted requests

The status=0 happens on network failure as well, so we can't ignore it completely.

Fixes #13130

Signed-off-by: Michal Čihař michal@cihar.com

Commit: c6c8c970ac6c273b20c983dbd1f269bc6d56bbb5 https://github.com/phpmyadmin/phpmyadmin/commit/c6c8c970ac6c273b20c983dbd1f2... Author: Michal Čihař michal@cihar.com Date: 2017-04-05 (Wed, 05 Apr 2017)

Changed paths: M js/ajax.js

Log Message: ----------- Add debug logging to the AJAX error handler

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 96b13f46c57f2f4494b5896e581f270b0018ca9f https://github.com/phpmyadmin/phpmyadmin/commit/96b13f46c57f2f4494b5896e581f... Author: Michal Čihař michal@cihar.com Date: 2017-04-05 (Wed, 05 Apr 2017)

Changed paths: M js/ajax.js

Log Message: ----------- Ensure the xhr attribute is reset on error

Not really necessary right now, but better be safe than sorry.

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 3a636ba45a6611dd864b02035233a8c6ebfa2a9c https://github.com/phpmyadmin/phpmyadmin/commit/3a636ba45a6611dd864b02035233... Author: Michal Čihař michal@cihar.com Date: 2017-04-05 (Wed, 05 Apr 2017)

Changed paths: M ChangeLog M js/ajax.js M js/console.js

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8a692c015c70...3a636ba45a66