[phpMyAdmin Git] [phpmyadmin/docker]

2017-04-05 Thread nijel 
  Branch: refs/tags/4.7.0-1
  Home:   https://github.com/phpmyadmin/docker
___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/docker] 0fb67d: Adjust cleanup to current releases

2017-04-05 Thread Michal Čihař 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/docker
  Commit: 0fb67d3437ad21eb71c480937020ad4cbec1e638
  
https://github.com/phpmyadmin/docker/commit/0fb67d3437ad21eb71c480937020ad4cbec1e638
  Author: Michal Čihař 
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
M Dockerfile

  Log Message:
  ---
  Adjust cleanup to current releases

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/docker] 331c34: These files are no longer part of release

2017-04-05 Thread Michal Čihař 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/docker
  Commit: 331c3452f44ddde0929b22398d3981e1d010fd26
  
https://github.com/phpmyadmin/docker/commit/331c3452f44ddde0929b22398d3981e1d010fd26
  Author: Michal Čihař 
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
M Dockerfile

  Log Message:
  ---
  These files are no longer part of release

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/docker] 942a0d: Update to 4.7.0

2017-04-05 Thread Michal Čihař 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/docker
  Commit: 942a0dd5ff3ff73f379ff9dffd6d71d67ef13fc0
  
https://github.com/phpmyadmin/docker/commit/942a0dd5ff3ff73f379ff9dffd6d71d67ef13fc0
  Author: Michal Čihař 
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
M Dockerfile

  Log Message:
  ---
  Update to 4.7.0

Fixes #113

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 1f4b6e: Ensure we have only integers in colum visibility a...

2017-04-05 Thread Michal Čihař 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 1f4b6ec0ac86574978ca2ae3d2c61c16260847a2
  
https://github.com/phpmyadmin/phpmyadmin/commit/1f4b6ec0ac86574978ca2ae3d2c61c16260847a2
  Author: Michal Čihař 
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
M ChangeLog
M libraries/Table.php
M libraries/sql.lib.php

  Log Message:
  ---
  Ensure we have only integers in colum visibility and ordering data

Fixes PHP error in case of invalid table preferences.

Fixes #13152

Signed-off-by: Michal Čihař 


  Commit: 0a135fa0ec2dad45ea51418a1f4cdd460855c88f
  
https://github.com/phpmyadmin/phpmyadmin/commit/0a135fa0ec2dad45ea51418a1f4cdd460855c88f
  Author: Michal Čihař 
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
M ChangeLog
M libraries/Table.php
M libraries/sql.lib.php

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/3a636ba45a66...0a135fa0ec2d___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 1f4b6e: Ensure we have only integers in colum visibility a...

2017-04-05 Thread Michal Čihař 
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 1f4b6ec0ac86574978ca2ae3d2c61c16260847a2
  
https://github.com/phpmyadmin/phpmyadmin/commit/1f4b6ec0ac86574978ca2ae3d2c61c16260847a2
  Author: Michal Čihař 
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
M ChangeLog
M libraries/Table.php
M libraries/sql.lib.php

  Log Message:
  ---
  Ensure we have only integers in colum visibility and ordering data

Fixes PHP error in case of invalid table preferences.

Fixes #13152

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f5655f: Do not try to parse error response

2017-04-05 Thread Michal Čihař 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f5655f4429899c243c2a19b39ebfc778a497995d
  
https://github.com/phpmyadmin/phpmyadmin/commit/f5655f4429899c243c2a19b39ebfc778a497995d
  Author: Michal Čihař 
  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ř 


  Commit: a079a55282b95f701ec315591149512cc29930b6
  
https://github.com/phpmyadmin/phpmyadmin/commit/a079a55282b95f701ec315591149512cc29930b6
  Author: Michal Čihař 
  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ř 


  Commit: 799ac0d4a0d1d6f2cb393c06e7d85e14dd89fa3a
  
https://github.com/phpmyadmin/phpmyadmin/commit/799ac0d4a0d1d6f2cb393c06e7d85e14dd89fa3a
  Author: Michal Čihař 
  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ř 


  Commit: c6c8c970ac6c273b20c983dbd1f269bc6d56bbb5
  
https://github.com/phpmyadmin/phpmyadmin/commit/c6c8c970ac6c273b20c983dbd1f269bc6d56bbb5
  Author: Michal Čihař 
  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ř 


  Commit: 96b13f46c57f2f4494b5896e581f270b0018ca9f
  
https://github.com/phpmyadmin/phpmyadmin/commit/96b13f46c57f2f4494b5896e581f270b0018ca9f
  Author: Michal Čihař 
  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ř 


  Commit: 3a636ba45a6611dd864b02035233a8c6ebfa2a9c
  
https://github.com/phpmyadmin/phpmyadmin/commit/3a636ba45a6611dd864b02035233a8c6ebfa2a9c
  Author: Michal Čihař 
  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___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f5655f: Do not try to parse error response

2017-04-05 Thread Michal Čihař 
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f5655f4429899c243c2a19b39ebfc778a497995d
  
https://github.com/phpmyadmin/phpmyadmin/commit/f5655f4429899c243c2a19b39ebfc778a497995d
  Author: Michal Čihař 
  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ř 


  Commit: a079a55282b95f701ec315591149512cc29930b6
  
https://github.com/phpmyadmin/phpmyadmin/commit/a079a55282b95f701ec315591149512cc29930b6
  Author: Michal Čihař 
  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ř 


  Commit: 799ac0d4a0d1d6f2cb393c06e7d85e14dd89fa3a
  
https://github.com/phpmyadmin/phpmyadmin/commit/799ac0d4a0d1d6f2cb393c06e7d85e14dd89fa3a
  Author: Michal Čihař 
  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ř 


  Commit: c6c8c970ac6c273b20c983dbd1f269bc6d56bbb5
  
https://github.com/phpmyadmin/phpmyadmin/commit/c6c8c970ac6c273b20c983dbd1f269bc6d56bbb5
  Author: Michal Čihař 
  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ř 


  Commit: 96b13f46c57f2f4494b5896e581f270b0018ca9f
  
https://github.com/phpmyadmin/phpmyadmin/commit/96b13f46c57f2f4494b5896e581f270b0018ca9f
  Author: Michal Čihař 
  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ř 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/946549d2deaa...96b13f46c57f___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git