Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 54c81312a9467a704a645e27e619d15f9aed542d
      
https://github.com/phpmyadmin/phpmyadmin/commit/54c81312a9467a704a645e27e619d15f9aed542d
  Author: Deven Bansod <devenbansod.b...@gmail.com>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M import.php

  Log Message:
  -----------
  If multiple queries are submitted, save the commulative bookmark only once

Fix #12179

Signed-off-by: Deven Bansod <devenbansod.b...@gmail.com>


  Commit: 96eba72fa6363ce4959efbd71b174048a82d7db0
      
https://github.com/phpmyadmin/phpmyadmin/commit/96eba72fa6363ce4959efbd71b174048a82d7db0
  Author: Deven Bansod <devenbansod.b...@gmail.com>
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
    M libraries/Util.php
    M libraries/sql.lib.php
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  Fix #12327: Show as PHP No longer works

Fix output of show_as_php. Don't show the links that are not required
or that may not work as expected

Signed-off-by: Deven Bansod <devenbansod.b...@gmail.com>


  Commit: 9bd75db679fd8b3c7da551074951dc993e66d721
      
https://github.com/phpmyadmin/phpmyadmin/commit/9bd75db679fd8b3c7da551074951dc993e66d721
  Author: Deven Bansod <devenbansod.b...@gmail.com>
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for #12327

Signed-off-by: Deven Bansod <devenbansod.b...@gmail.com>


  Commit: fdc80a2fd935f8db871b548a6deb2fddbf006e67
      
https://github.com/phpmyadmin/phpmyadmin/commit/fdc80a2fd935f8db871b548a6deb2fddbf006e67
  Author: Deven Bansod <devenbansod.b...@gmail.com>
  Date:   2016-09-30 (Fri, 30 Sep 2016)

  Changed paths:
    M js/codemirror/addon/lint/sql-lint.js

  Log Message:
  -----------
  Fix #12455: Query history stores separate entry for every letter typed

Don't store history when linting, rather store it only when user has submitted 
the query.

Signed-off-by: Deven Bansod <devenbansod.b...@gmail.com>


  Commit: 5c74f443578152f59a3c688b5cc5cf3d756afff6
      
https://github.com/phpmyadmin/phpmyadmin/commit/5c74f443578152f59a3c688b5cc5cf3d756afff6
  Author: Deven Bansod <devenbansod.b...@gmail.com>
  Date:   2016-09-30 (Fri, 30 Sep 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for #12455

Signed-off-by: Deven Bansod <devenbansod.b...@gmail.com>


  Commit: 200a92b73801c140d3d916c518e1458be7868557
      
https://github.com/phpmyadmin/phpmyadmin/commit/200a92b73801c140d3d916c518e1458be7868557
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M ChangeLog
    M js/codemirror/addon/lint/sql-lint.js

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/pull/12601' into QA_4_6


  Commit: 0292b89c4a9a6837c5fce64ba0c80aaf1e216a83
      
https://github.com/phpmyadmin/phpmyadmin/commit/0292b89c4a9a6837c5fce64ba0c80aaf1e216a83
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M ChangeLog
    M libraries/Util.php
    M libraries/sql.lib.php
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/pull/12596' into QA_4_6


  Commit: 5071b8a0166672bdfccb18556e58c647aae77df6
      
https://github.com/phpmyadmin/phpmyadmin/commit/5071b8a0166672bdfccb18556e58c647aae77df6
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M import.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/pull/12584' into QA_4_6


  Commit: 4ba041720fb0177f156547b09915d3e13d98144d
      
https://github.com/phpmyadmin/phpmyadmin/commit/4ba041720fb0177f156547b09915d3e13d98144d
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Changelog entry for #12584

Signed-off-by: Michal Čihař <mic...@cihar.com>


  Commit: fc5bb4a278702d816eb0713427d22ad645f988d7
      
https://github.com/phpmyadmin/phpmyadmin/commit/fc5bb4a278702d816eb0713427d22ad645f988d7
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M ChangeLog
    M import.php
    M js/codemirror/addon/lint/sql-lint.js
    M libraries/Util.php
    M libraries/sql.lib.php
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/d24848400d1d...fc5bb4a27870
_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

Reply via email to