[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 33343f: bug #4398 Monitor should fit into screen width

Madhura Jayaratne madhura.cj at gmail.com
Sun May 18 10:43:55 CEST 2014


  Branch: refs/heads/QA_4_2
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 33343fbdf489043286b2413803d63b1298ebb20f
      https://github.com/phpmyadmin/phpmyadmin/commit/33343fbdf489043286b2413803d63b1298ebb20f
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-05-18 (Sun, 18 May 2014)

  Changed paths:
    M ChangeLog
    M js/server_status_monitor.js
    M libraries/server_status_monitor.lib.php
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  bug #4398 Monitor should fit into screen width

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


  Commit: 117490393a533fe29e9bc73ca23a0d99e700b472
      https://github.com/phpmyadmin/phpmyadmin/commit/117490393a533fe29e9bc73ca23a0d99e700b472
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-05-18 (Sun, 18 May 2014)

  Changed paths:
    M ChangeLog
    M js/server_status_monitor.js
    M libraries/TableSearch.class.php
    M libraries/insert_edit.lib.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Database_Container.class.php
    M libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php
    M libraries/structure.lib.php
    M po/pt_BR.po
    M po/sv.po
    M po/th.po
    M test/classes/plugin/transformations/Image_Link_test.php
    M test/libraries/PMA_insert_edit_test.php

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

Conflicts:
	ChangeLog


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2986cdcd8ad1...117490393a53


More information about the Git mailing list