Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 80ed9fea8dd5486b1afba9090b82c7f75235517b https://github.com/phpmyadmin/phpmyadmin/commit/80ed9fea8dd5486b1afba9090b82... Author: adamgsoc2013 adamgsoc2013@gmail.com Date: 2013-06-29 (Sat, 29 Jun 2013)

Changed paths: M libraries/plugins/import/ImportOds.class.php A test/classes/plugin/import/ImportOds_test.php A test/test_data/db_test.ods

Log Message: ----------- 1. add UT for import ODS 2. fix warning in source code when import ODS file

Commit: f818a5dd689c8a867af4ba567dcd025eb300be10 https://github.com/phpmyadmin/phpmyadmin/commit/f818a5dd689c8a867af4ba567dcd... Author: adamgsoc2013 adamgsoc2013@gmail.com Date: 2013-06-29 (Sat, 29 Jun 2013)

Changed paths: M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- fix the assert failure

Commit: 012aac365b474c86e68e21d42f52a7e6dfd5863d https://github.com/phpmyadmin/phpmyadmin/commit/012aac365b474c86e68e21d42f52... Author: adamgsoc2013 adamgsoc2013@gmail.com Date: 2013-06-29 (Sat, 29 Jun 2013)

Changed paths: M libraries/server_plugins.lib.php M po/da.po

Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_pluginss

Commit: 3138f18769dc5ae48ffcef5b5ae961f7526cf9ea https://github.com/phpmyadmin/phpmyadmin/commit/3138f18769dc5ae48ffcef5b5ae9... Author: adamgsoc2013 adamgsoc2013@gmail.com Date: 2013-07-01 (Mon, 01 Jul 2013)

Changed paths: M libraries/plugins/import/ImportOds.class.php M test/classes/plugin/import/ImportOds_test.php M test/test_data/db_test.ods

Log Message: ----------- using OpenOffice ODS file for importing ods testing

Commit: b8be7d628571b35ba0354bbbc28095bd0a0cde95 https://github.com/phpmyadmin/phpmyadmin/commit/b8be7d628571b35ba0354bbbc280... Author: Michal Čihař michal@cihar.com Date: 2013-07-01 (Mon, 01 Jul 2013)

Changed paths: M test/classes/PMA_DisplayResults_test.php A test/classes/plugin/import/ImportOds_test.php A test/test_data/db_test.ods

Log Message: ----------- Merge pull request #463 from adamgsoc2013/UT_pluginss

1. add UT for import ODS 2. fix warning in source code when import ODS file

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/61554c9c7884...b8be7d628571