[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 935e8f: Initiate porting monitor tab to jqplot

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 935e8fd3669428756e31dc2a8c3aaf8d27f0d06b https://github.com/phpmyadmin/phpmyadmin/commit/935e8fd3669428756e31dc2a8c3… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2012-08-19 (Sun, 19 Aug 2012) Changed paths: M js/server_status_monitor.js Log Message: ----------- Initiate porting monitor tab to jqplot Commit: 0fa11e0e673b3b37a8fbfb49e1de0f6842f3838e https://github.com/phpmyadmin/phpmyadmin/commit/0fa11e0e673b3b37a8fbfb49e1d… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-08-20 (Mon, 20 Aug 2012) Changed paths: M js/jqplot/jquery.jqplot.js M js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js M js/jqplot/plugins/jqplot.canvasTextRenderer.js M js/jqplot/plugins/jqplot.cursor.js M js/jqplot/plugins/jqplot.dateAxisRenderer.js M js/jqplot/plugins/jqplot.highlighter.js M js/jqplot/plugins/jqplot.pieRenderer.js M js/server_status.js M js/server_status_monitor.js M server_status.php Log Message: ----------- Merge branch 'atul-QA_3_5-jqplot' into QA_3_5 Commit: 6638dd17f4d5b01502392462b806bc16da571497 https://github.com/phpmyadmin/phpmyadmin/commit/6638dd17f4d5b01502392462b80… Author: Wolf Chou <wolf168(a)gmail.com> Date: 2012-08-20 (Mon, 20 Aug 2012) Changed paths: M po/zh_TW.po Log Message: ----------- Translated using Weblate. Commit: 23b3c3213e2df582b475b5ea6a26e6c5e397153b https://github.com/phpmyadmin/phpmyadmin/commit/23b3c3213e2df582b475b5ea6a2… Author: Weblate <noreply(a)weblate.org> Date: 2012-08-20 (Mon, 20 Aug 2012) Changed paths: M js/jqplot/jquery.jqplot.js M js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js M js/jqplot/plugins/jqplot.canvasTextRenderer.js M js/jqplot/plugins/jqplot.cursor.js M js/jqplot/plugins/jqplot.dateAxisRenderer.js M js/jqplot/plugins/jqplot.highlighter.js M js/jqplot/plugins/jqplot.pieRenderer.js M js/server_status.js M js/server_status_monitor.js M server_status.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 Commit: a483935cf8aac81a2d87390af36f387100f3bdf2 https://github.com/phpmyadmin/phpmyadmin/commit/a483935cf8aac81a2d87390af36… Author: J.M <me(a)mynetx.net> Date: 2012-08-22 (Wed, 22 Aug 2012) Changed paths: M ChangeLog M js/server_privileges.js M server_privileges.php Log Message: ----------- bug #3559925 [privileges] Incorrect updating of the list of users Commit: 11102c07f0bb868b508222efcbfd1ed509cae474 https://github.com/phpmyadmin/phpmyadmin/commit/11102c07f0bb868b508222efcbf… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-08-22 (Wed, 22 Aug 2012) Changed paths: M server_status.php Log Message: ----------- Remove unnecessary caps Commit: 571fb402e66550dbde34b7e543fce530c73adef8 https://github.com/phpmyadmin/phpmyadmin/commit/571fb402e66550dbde34b7e543f… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-08-22 (Wed, 22 Aug 2012) Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/ko.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update .po files Commit: e0383e6b1938dd5a5fd377e27d04c3880b6c2d6d https://github.com/phpmyadmin/phpmyadmin/commit/e0383e6b1938dd5a5fd377e27d0… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-08-22 (Wed, 22 Aug 2012) Changed paths: M server_privileges.php Log Message: ----------- Remove extraneous characters Commit: 8b26aad9e0212223424058e380ca0b22267d352d https://github.com/phpmyadmin/phpmyadmin/commit/8b26aad9e0212223424058e380c… Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: 2012-08-22 (Wed, 22 Aug 2012) Changed paths: M po/el.po Log Message: ----------- Translated using Weblate. Commit: 909608a58b50937cb018227f81759abc3f39f22f https://github.com/phpmyadmin/phpmyadmin/commit/909608a58b50937cb018227f817… Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: 2012-08-22 (Wed, 22 Aug 2012) Changed paths: M po/el.po Log Message: ----------- Translated using Weblate. Commit: 4009a06427e2e557d2f4a3196998a8722205a986 https://github.com/phpmyadmin/phpmyadmin/commit/4009a06427e2e557d2f4a319699… Author: Michal Čihař <michal(a)cihar.com> Date: 2012-08-22 (Wed, 22 Aug 2012) Changed paths: M po/cs.po Log Message: ----------- Translated using Weblate. Commit: 7ea30f9b6b28ea60e069b5367977d1b6a2cfeb8c https://github.com/phpmyadmin/phpmyadmin/commit/7ea30f9b6b28ea60e069b536797… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-08-22 (Wed, 22 Aug 2012) Changed paths: M js/server_status_monitor.js Log Message: ----------- Merge commit '0fa11e0e673b3b37a8fbfb49e1de0f6842f3838e' Commit: d7145f4783a6f3a2fdaab6c5ee3ec89bd3dfa3a3 https://github.com/phpmyadmin/phpmyadmin/commit/d7145f4783a6f3a2fdaab6c5ee3… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-08-22 (Wed, 22 Aug 2012) Changed paths: M server_status.php Log Message: ----------- Remove unnecessary caps Commit: a466b15f8266e7c565de224f41f848ecd016eeb9 https://github.com/phpmyadmin/phpmyadmin/commit/a466b15f8266e7c565de224f41f… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-08-22 (Wed, 22 Aug 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a9342b822e79...a466b15f8266