Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 62ea33921dd2a66f03cf80c120b3cee8c10da332 https://github.com/phpmyadmin/phpmyadmin/commit/62ea33921dd2a66f03cf80c120b3... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)

Changed paths: M server_status.php M themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css

Log Message: ----------- Sortable ability for server processlist

Commit: 54dfe9eb0fb382f442b8dabc1bc9145a2e83dfa8 https://github.com/phpmyadmin/phpmyadmin/commit/54dfe9eb0fb382f442b8dabc1bc9... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)

Changed paths: M ChangeLog M libraries/Menu.class.php M libraries/Table.class.php M libraries/operations.lib.php M libraries/tbl_info.inc.php M phpinfo.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 tbl_operations.php

Log Message: ----------- Merge remote branch 'upstream/master'

Commit: 20b196daf5a694eed69edd27807c1bd0f74cf61c https://github.com/phpmyadmin/phpmyadmin/commit/20b196daf5a694eed69edd27807c... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-08-11 (Sat, 11 Aug 2012)

Changed paths: M libraries/DisplayResults.class.php

Log Message: ----------- Fixed some code violations in PMA_DisplayResults class

Commit: fde2a58babca31808f43eed0ff9f24d3c40e208f https://github.com/phpmyadmin/phpmyadmin/commit/fde2a58babca31808f43eed0ff9f... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- Improve some tests for functions in PMA_DisplayResults class

Commit: 054fab3ffef52fed86c5733e8cbe9d89ff07ccae https://github.com/phpmyadmin/phpmyadmin/commit/054fab3ffef52fed86c5733e8cbe... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-08-12 (Sun, 12 Aug 2012)

Changed paths: M ChangeLog M js/tbl_gis_visualization.js M libraries/rte/rte_triggers.lib.php M po/th.po M tbl_create.php

Log Message: ----------- Merge remote branch 'upstream/master'

Commit: a8c9bded2f4059959cdd11dd893fbf47bf11a075 https://github.com/phpmyadmin/phpmyadmin/commit/a8c9bded2f4059959cdd11dd893f... Author: Michal Čihař mcihar@suse.cz Date: 2012-08-13 (Mon, 13 Aug 2012)

Changed paths: M libraries/DisplayResults.class.php M server_status.php M test/classes/PMA_DisplayResults_test.php M themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css

Log Message: ----------- Merge remote-tracking branch 'chanaka/master'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/29ea192a8101...a8c9bded2f40