[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 773c50: 4.2.7 release

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 773c507cda348a5a5518fb5c5daa8ed0de176359
      https://github.com/phpmyadmin/phpmyadmin/commit/773c507cda348a5a5518fb5c5daa8ed0de176359
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.2.7 release

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 0cd293f5e13aa245e4a57b8d373597cc0e421b6f
      https://github.com/phpmyadmin/phpmyadmin/commit/0cd293f5e13aa245e4a57b8d373597cc0e421b6f
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M ChangeLog
    M js/functions.js

  Log Message:
  -----------
  bug #4505 [security] XSS in view operations page

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 647c9d12e33a6b64e1c3ff7487f72696bdf2dccb
      https://github.com/phpmyadmin/phpmyadmin/commit/647c9d12e33a6b64e1c3ff7487f72696bdf2dccb
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M ChangeLog
    M js/sql.js

  Log Message:
  -----------
  bug #4501 [security] XSS in table browse page

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 2c45d7caa614afd71dbe3d0f7270f51ce5569614
      https://github.com/phpmyadmin/phpmyadmin/commit/2c45d7caa614afd71dbe3d0f7270f51ce5569614
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M ChangeLog
    M js/functions.js

  Log Message:
  -----------
  bug #4502 [security] Self-XSS in enum value editor

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: cd9f302bf7f91a160fe7080f9a612019ef847f1c
      https://github.com/phpmyadmin/phpmyadmin/commit/cd9f302bf7f91a160fe7080f9a612019ef847f1c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M ChangeLog
    M js/server_status_monitor.js

  Log Message:
  -----------
  bug #4503 [security] Self-XSSes in monitor

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 90ddeecf60fc029608b972e490b735f3a65ed0cb
      https://github.com/phpmyadmin/phpmyadmin/commit/90ddeecf60fc029608b972e490b735f3a65ed0cb
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M ChangeLog
    M js/tbl_chart.js

  Log Message:
  -----------
  bug #4504 [security] Self-XSS in query charts

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 3ffc967fb60cf2910cc2f571017e977558c67821
      https://github.com/phpmyadmin/phpmyadmin/commit/3ffc967fb60cf2910cc2f571017e977558c67821
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M ChangeLog
    M libraries/tbl_relation.lib.php

  Log Message:
  -----------
  bug #4517 [security] XSS in relation view

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 0c7702518b87c61daae1c8b00a0f9f56f0ccad87
      https://github.com/phpmyadmin/phpmyadmin/commit/0c7702518b87c61daae1c8b00a0f9f56f0ccad87
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Log Message:
  -----------
  Merge commit '773c507'


  Commit: 38b8cd7a803f314fbe2975fa39273839875f60ea
      https://github.com/phpmyadmin/phpmyadmin/commit/38b8cd7a803f314fbe2975fa39273839875f60ea
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M ChangeLog
    M js/functions.js
    M js/server_status_monitor.js
    M js/sql.js
    M js/tbl_chart.js

  Log Message:
  -----------
  Fix merge conflict

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 8ee9b58d9001f1467bfeb0a5fdb7052a1435739f
      https://github.com/phpmyadmin/phpmyadmin/commit/8ee9b58d9001f1467bfeb0a5fdb7052a1435739f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix merge conflict

Signed-off-by: Marc Delisle <marc at infomarc.info>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0d8c331a97e2...8ee9b58d9001