[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 21b63f: Fix js reports: JSONparse Syntax Error: Unexpected...

Madhura Jayaratne madhura.cj at gmail.com
Tue Dec 23 10:46:25 CET 2014


  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 21b63f9af40d2fde8b88eb27c868fd369926cc1f
      https://github.com/phpmyadmin/phpmyadmin/commit/21b63f9af40d2fde8b88eb27c868fd369926cc1f
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Changed paths:
    M js/console.js

  Log Message:
  -----------
  Fix js reports: JSONparse Syntax Error: Unexpected token '<'

Signed-off-by: Atul Pratap Singh <atulpratapsingh05 at gmail.com>


  Commit: 7cf678f79df2fb017bcb74750cf1108ff4ee55f4
      https://github.com/phpmyadmin/phpmyadmin/commit/7cf678f79df2fb017bcb74750cf1108ff4ee55f4
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-12-23 (Tue, 23 Dec 2014)

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

  Log Message:
  -----------
  bug #4664 select min() displays 1 row, but reports the table amount of rows returned

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 974f7afe71e9d37fc08bf16694beb15da3a8da56
      https://github.com/phpmyadmin/phpmyadmin/commit/974f7afe71e9d37fc08bf16694beb15da3a8da56
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Changed paths:
    M ChangeLog
    M js/console.js
    M libraries/sql.lib.php
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  Merge branch 'QA_4_3'

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 6e688982cc5c21e4ea6119512fc7b7a50049cacc
      https://github.com/phpmyadmin/phpmyadmin/commit/6e688982cc5c21e4ea6119512fc7b7a50049cacc
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/26ecf0e95495...6e688982cc5c


More information about the Git mailing list