Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f6a0e4cf46ceee2cb536e84e290ca50163821f06 https://github.com/phpmyadmin/phpmyadmin/commit/f6a0e4cf46ceee2cb536e84e290c... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-02 (Mon, 02 Jul 2012)

Changed paths: M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- Test for _getEditLink function in PMA_DisplayResults class

Commit: a4b02c26e6573ae5de9277aec2d253ae8b946913 https://github.com/phpmyadmin/phpmyadmin/commit/a4b02c26e6573ae5de9277aec2d2... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-03 (Tue, 03 Jul 2012)

Changed paths: M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- Test for _getCopyLink function in PMA_DisplayResults class

Commit: c35dd10750a14edaae8291342521aa91da90ffe8 https://github.com/phpmyadmin/phpmyadmin/commit/c35dd10750a14edaae8291342521... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-03 (Tue, 03 Jul 2012)

Changed paths: M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- Test for _getDeleteLink function in PMA_DisplayResults class

Commit: 68ddeb300873019ede8384d66a0e862fd51092b0 https://github.com/phpmyadmin/phpmyadmin/commit/68ddeb300873019ede8384d66a0e... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-03 (Tue, 03 Jul 2012)

Changed paths: M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- Test for _getCheckboxAndLinks function in PMA_DisplayResults class

Commit: d2ef499359547473f1e96cfef1eaf77a976932e6 https://github.com/phpmyadmin/phpmyadmin/commit/d2ef499359547473f1e96cfef1ea... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-03 (Tue, 03 Jul 2012)

Changed paths: M export.php M libraries/Tracker.class.php M libraries/transformations.lib.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 test/classes/PMA_Footer_test.php M transformation_wrapper.php M user_password.php

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

Commit: d357356e45ab887c7eb301f62f43bf74567bb6d5 https://github.com/phpmyadmin/phpmyadmin/commit/d357356e45ab887c7eb301f62f43... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-03 (Tue, 03 Jul 2012)

Changed paths: M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- Test for _mimeDefaultFunction function in PMA_DisplayResults class

Commit: 1c245c06f3adcf76d216cd763ca656e2458a0492 https://github.com/phpmyadmin/phpmyadmin/commit/1c245c06f3adcf76d216cd763ca6... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-03 (Tue, 03 Jul 2012)

Changed paths: M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- Test for _getPlacedLinks function in PMA_DisplayResults class

Commit: 9009aff1ba534ffa07fd5df7db0282fcec204981 https://github.com/phpmyadmin/phpmyadmin/commit/9009aff1ba534ffa07fd5df7db02... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-03 (Tue, 03 Jul 2012)

Changed paths: M po/fa.po M po/lt.po M po/ur.po M test/classes/PMA_Theme_test.php

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

Commit: 51775c5aa902bcfaa0700fa0aae4c37afb0e840f https://github.com/phpmyadmin/phpmyadmin/commit/51775c5aa902bcfaa0700fa0aae4... Author: Michal Čihař michal@cihar.com Date: 2012-07-04 (Wed, 04 Jul 2012)

Changed paths: M test/classes/PMA_DisplayResults_test.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/312c09dfb284...51775c5aa902