Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: ceeec424d7dd3ee499d09e4ade7519c2a1f3769c
https://github.com/phpmyadmin/phpmyadmin/commit/ceeec424d7dd3ee499d09e4ade7…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M ChangeLog
M libraries/display_import.lib.php
Log Message:
-----------
#11728 CSV import skip row count after
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 76a416283aac635cdd189ab8f8b8c35f4fb50da2
https://github.com/phpmyadmin/phpmyadmin/commit/76a416283aac635cdd189ab8f8b…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M test/classes/plugin/export/PMA_ExportXml_test.php
Log Message:
-----------
Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 6016b64836afd88f9efa398ba31a7619b8ffe309
https://github.com/phpmyadmin/phpmyadmin/commit/6016b64836afd88f9efa398ba31…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M test/classes/plugin/export/PMA_ExportSql_test.php
Log Message:
-----------
Loosen some assertions. We are tying to prevent calls to dbi.
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 968bfd354c93603e06694713acc76a5b541ee459
https://github.com/phpmyadmin/phpmyadmin/commit/968bfd354c93603e06694713acc…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M test/classes/plugin/export/PMA_ExportSql_test.php
M test/classes/plugin/export/PMA_ExportXml_test.php
Log Message:
-----------
Fix broken tests
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 1c7282b85977943e82c2287cf4da17d34a042fc1
https://github.com/phpmyadmin/phpmyadmin/commit/1c7282b85977943e82c2287cf4d…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M ChangeLog
M libraries/display_import.lib.php
M test/classes/plugin/export/ExportSqlTest.php
M test/classes/plugin/export/ExportXmlTest.php
Log Message:
-----------
Merge branch 'QA_4_5'
Conflicts:
test/classes/plugin/export/ExportSqlTest.php
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/dcdd08a0439c...1c7282b85977