Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 33343fbdf489043286b2413803d63b1298ebb20f
https://github.com/phpmyadmin/phpmyadmin/commit/33343fbdf489043286b2413803d63b1298ebb20f
Author: Madhura Jayaratne <madhura...@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...@gmail.com>
Commit: 117490393a533fe29e9bc73ca23a0d99e700b472
https://github.com/phpmyadmin/phpmyadmin/commit/117490393a533fe29e9bc73ca23a0d99e700b472
Author: Madhura Jayaratne <madhura...@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
Commit: f79ab273a2f5e3c3ef76b7c27e088fdb37c05d8d
https://github.com/phpmyadmin/phpmyadmin/commit/f79ab273a2f5e3c3ef76b7c27e088fdb37c05d8d
Author: Madhura Jayaratne <madhura...@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:
-----------
Merge branch 'QA_4_2'
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/82ff185f3987...f79ab273a2f5------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
