[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d87a99: moving inline js out from db_designer.lib.php plus...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d87a99e01c1856775b8b585618aa69b679e9c69f
      https://github.com/phpmyadmin/phpmyadmin/commit/d87a99e01c1856775b8b585618aa69b679e9c69f
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M js/pmd/history.js
    M js/pmd/move.js
    M libraries/db_designer.lib.php
    M themes/pmahomme/css/pmd.css.php

  Log Message:
  -----------
  moving inline js out from db_designer.lib.php plus minor bug fixes

Signed-off-by: Smita Kumari <kumarismita62 at gmail.com>


  Commit: 41eda0819afba3589bf3e4be4c6626525b4d27d3
      https://github.com/phpmyadmin/phpmyadmin/commit/41eda0819afba3589bf3e4be4c6626525b4d27d3
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M ChangeLog
    M import.php
    M js/navigation.js
    M js/server_status_monitor.js
    M js/tbl_chart.js
    M libraries/Config.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/core.lib.php
    M libraries/relation.lib.php
    M po/ca.po
    M po/cs.po
    M server_privileges.php

  Log Message:
  -----------
  resolve conflict

Signed-off-by: Smita Kumari <kumarismita62 at gmail.com>


  Commit: b4906839e4754ca0648541261644acfcdb585885
      https://github.com/phpmyadmin/phpmyadmin/commit/b4906839e4754ca0648541261644acfcdb585885
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M libraries/core.lib.php

  Log Message:
  -----------
  remove trailing white spaces

Signed-off-by: Smita Kumari <kumarismita62 at gmail.com>


  Commit: 28622a4bccc9fa506bd7dd07e266bb5e2de6d885
      https://github.com/phpmyadmin/phpmyadmin/commit/28622a4bccc9fa506bd7dd07e266bb5e2de6d885
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-10-22 (Wed, 22 Oct 2014)

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

  Log Message:
  -----------
  fixing coding style

Signed-off-by: Smita Kumari <kumarismita62 at gmail.com>


  Commit: 0f58673cee9153b5573864581a4582bd4a74dbdb
      https://github.com/phpmyadmin/phpmyadmin/commit/0f58673cee9153b5573864581a4582bd4a74dbdb
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M js/pmd/history.js
    M js/pmd/move.js
    M libraries/core.lib.php
    M libraries/db_designer.lib.php
    M themes/pmahomme/css/pmd.css.php

  Log Message:
  -----------
  Merge pull request #1383 from smita786/master

moving out inline js from db_designer.lib.php plus minor bug fixes


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5b5d50e471fa...0f58673cee91