[Phpmyadmin-git] [phpmyadmin/phpmyadmin] a0beb6: bug Missing selected/entered values when editing a...

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a0beb6da88b88f8bcb4c64802fcb704c17cb6d06
      https://github.com/phpmyadmin/phpmyadmin/commit/a0beb6da88b88f8bcb4c64802fcb704c17cb6d06
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M ChangeLog
    M js/pmd/history.js
    M libraries/db_designer.lib.php

  Log Message:
  -----------
  bug Missing selected/entered values when editing active options in visual query builder

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


  Commit: 77a0b44fc3e0d2126993da0affd2801147fb7642
      https://github.com/phpmyadmin/phpmyadmin/commit/77a0b44fc3e0d2126993da0affd2801147fb7642
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M ChangeLog
    M js/pmd/history.js
    M templates/designer/aggregate_query_panel.phtml

  Log Message:
  -----------
  Merge branch 'QA_4_4'

Conflicts:
	libraries/db_designer.lib.php


  Commit: 7450a2093fbceb8c6f27aacca627d6259f1f1c66
      https://github.com/phpmyadmin/phpmyadmin/commit/7450a2093fbceb8c6f27aacca627d6259f1f1c66
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M libraries/config/FormDisplay.tpl.php

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5784566a23f7...7450a2093fbc