Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 061b4519c97ea7fd7fa80e18dfd5863feb6e27ef
https://github.com/phpmyadmin/phpmyadmin/commit/061b4519c97ea7fd7fa80e18dfd5863feb6e27ef
Author: Atul Pratap Singh <[email protected]>
Date: 2012-08-27 (Mon, 27 Aug 2012)
Changed paths:
M js/server_status_monitor.js
Log Message:
-----------
Replace some highchart specific chart settings with jqplot ones
Commit: a293fef4346551561357e7440801a8a491efe6b1
https://github.com/phpmyadmin/phpmyadmin/commit/a293fef4346551561357e7440801a8a491efe6b1
Author: Atul Pratap Singh <[email protected]>
Date: 2012-08-28 (Tue, 28 Aug 2012)
Changed paths:
M js/server_status_monitor.js
Log Message:
-----------
Remove y axis label and add title
Commit: f9e197fa77cbafefe4ef88254b31cfe60cf559a7
https://github.com/phpmyadmin/phpmyadmin/commit/f9e197fa77cbafefe4ef88254b31cfe60cf559a7
Author: Atul Pratap Singh <[email protected]>
Date: 2012-08-28 (Tue, 28 Aug 2012)
Changed paths:
M js/server_status_monitor.js
Log Message:
-----------
jqplot: set min, max values for x axis
Commit: 4d2c49723c566f82d3ca40962678a4d76f366b2c
https://github.com/phpmyadmin/phpmyadmin/commit/4d2c49723c566f82d3ca40962678a4d76f366b2c
Author: Atul Pratap Singh <[email protected]>
Date: 2012-08-28 (Tue, 28 Aug 2012)
Changed paths:
M js/server_status_monitor.js
Log Message:
-----------
jqplot: add wrongly removed node parameters
Commit: c418319bb6dcadd522936ef7fafb48f18dabee63
https://github.com/phpmyadmin/phpmyadmin/commit/c418319bb6dcadd522936ef7fafb48f18dabee63
Author: Atul Pratap Singh <[email protected]>
Date: 2012-08-28 (Tue, 28 Aug 2012)
Changed paths:
M js/server_status_monitor.js
Log Message:
-----------
jqplot: remove highcharts settings from chart object
Commit: 4c283ca5602f4dcf80c6b22d2543bc8f102f5c66
https://github.com/phpmyadmin/phpmyadmin/commit/4c283ca5602f4dcf80c6b22d2543bc8f102f5c66
Author: Atul Pratap Singh <[email protected]>
Date: 2012-08-29 (Wed, 29 Aug 2012)
Changed paths:
M js/server_status_monitor.js
Log Message:
-----------
jqplot: fix broken data refresh, still not displayed properly in charts
Commit: 2f88914bbd7a93d0684a5b09534c2d85610010ac
https://github.com/phpmyadmin/phpmyadmin/commit/2f88914bbd7a93d0684a5b09534c2d85610010ac
Author: Atul Pratap Singh <[email protected]>
Date: 2012-08-30 (Thu, 30 Aug 2012)
Changed paths:
M js/server_status_monitor.js
Log Message:
-----------
jqplot: fix settings to somewhat enable charts
Commit: d44714fefc706e181c16e183a38bf19861f5095e
https://github.com/phpmyadmin/phpmyadmin/commit/d44714fefc706e181c16e183a38bf19861f5095e
Author: Atul Pratap Singh <[email protected]>
Date: 2012-08-30 (Thu, 30 Aug 2012)
Changed paths:
M js/server_status_monitor.js
Log Message:
-----------
Resolve conflicts while merging QA_3_5-jqplot to master
Commit: 47e79dea1feda8ec2ae890dcd43054995cd79ecf
https://github.com/phpmyadmin/phpmyadmin/commit/47e79dea1feda8ec2ae890dcd43054995cd79ecf
Author: Atul Pratap Singh <[email protected]>
Date: 2012-08-30 (Thu, 30 Aug 2012)
Changed paths:
M db_operations.php
M db_structure.php
M import.php
M js/tbl_zoom_plot_jqplot.js
M libraries/CommonFunctions.class.php
M libraries/Tracker.class.php
M libraries/error.inc.php
M libraries/mult_submits.inc.php
M libraries/replication_gui.lib.php
M libraries/rte/rte_routines.lib.php
M libraries/structure.lib.php
M libraries/transformations.lib.php
M po/pa.po
M po/pt_BR.po
M sql.php
M tbl_change.php
M tbl_operations.php
M tbl_structure.php
M tbl_tracking.php
M test/classes/PMA_List_Database_test.php
M test/classes/PMA_Theme_Manager_test.php
M test/classes/PMA_Theme_test.php
M test/classes/gis/PMA_GIS_Linestring_test.php
M test/libraries/PMA_bookmark_test.php
M test/libraries/PMA_zip_extension_test.php
M view_create.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/c49a5df9a3a6...47e79dea1fed
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
