Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 66863fe981e9d5ccac9b498ff834718027d6b6c2 https://github.com/phpmyadmin/phpmyadmin/commit/66863fe981e9d5ccac9b498ff834... Author: Chanaka Indrajith <pe.chanaka.ck@gmail.com> Date: 2012-05-24 (Thu, 24 May 2012) Changed paths: M libraries/display_tbl.lib.php Log Message: ----------- Fixed some code violations in display_tbl.lib.php Commit: 946009aace50c27ff79a051f0a9f3bbffc456337 https://github.com/phpmyadmin/phpmyadmin/commit/946009aace50c27ff79a051f0a9f... Author: Chanaka Indrajith <pe.chanaka.ck@gmail.com> Date: 2012-05-24 (Thu, 24 May 2012) Changed paths: M libraries/common.lib.php Log Message: ----------- Fixed some code violations in common.lib.php Commit: e3662c3442c20a94d478c0633556b73f108f267d https://github.com/phpmyadmin/phpmyadmin/commit/e3662c3442c20a94d478c0633556... Author: Chanaka Indrajith <pe.chanaka.ck@gmail.com> Date: 2012-05-27 (Sun, 27 May 2012) Changed paths: M ChangeLog M js/functions.js A js/jqplot/jquery.jqplot.js A js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js A js/jqplot/plugins/jqplot.canvasTextRenderer.js A js/jqplot/plugins/jqplot.cursor.js A js/jqplot/plugins/jqplot.dateAxisRenderer.js A js/jqplot/plugins/jqplot.highlighter.js A js/jqplot/plugins/jqplot.pieRenderer.js M js/messages.php M js/sql.js R js/tbl_zoom_plot.js A js/tbl_zoom_plot_jqplot.js M libraries/Theme.class.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.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/hy.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.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@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@latin.po M po/zh_CN.po M po/zh_TW.po M server_status.php M sql.php M tbl_zoom_select.php M themes/original/css/common.css.php A themes/pmahomme/css/jqplot.css.php Log Message: ----------- Merge remote branch 'upstream/master' Commit: b6df92a52755a209d830b3c13d9676b05cf1f289 https://github.com/phpmyadmin/phpmyadmin/commit/b6df92a52755a209d830b3c13d96... Author: Michal Čihař <mcihar@suse.cz> Date: 2012-05-29 (Tue, 29 May 2012) Changed paths: M libraries/common.lib.php M libraries/display_tbl.lib.php Log Message: ----------- Merge remote-tracking branch 'chanaka/master' Commit: deb18d85c60e2fccc5b1717d35fe3e3beebd1138 https://github.com/phpmyadmin/phpmyadmin/commit/deb18d85c60e2fccc5b1717d35fe... Author: Michal Čihař <mcihar@suse.cz> Date: 2012-05-29 (Tue, 29 May 2012) Changed paths: M libraries/display_tbl.lib.php Log Message: ----------- Do not wrap translation lines Commit: 556dbe61d627531c615b68cd7eff1a75809cd011 https://github.com/phpmyadmin/phpmyadmin/commit/556dbe61d627531c615b68cd7eff... Author: Michal Čihař <mcihar@suse.cz> Date: 2012-05-29 (Tue, 29 May 2012) Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.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/hy.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.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@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@latin.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files Compare: https://github.com/phpmyadmin/phpmyadmin/compare/655afbe...556dbe6