Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: eeb32aa0df7b3d66939fa087835968aa13d610af https://github.com/phpmyadmin/phpmyadmin/commit/eeb32aa0df7b3d66939fa0878359... Author: Yungu Kim crimsonpi@gmail.com Date: 2014-04-07 (Mon, 07 Apr 2014)

Changed paths: M po/ko.po

Log Message: ----------- Translated using Weblate (Korean)

Currently translated at 78.6% (2164 of 2750)

Commit: 2186e0fc2b75b891e8e88912268fc93455bbf519 https://github.com/phpmyadmin/phpmyadmin/commit/2186e0fc2b75b891e8e88912268f... Author: Luis Eduardo Braschi herrcasper@gmail.com Date: 2014-04-07 (Mon, 07 Apr 2014)

Changed paths: M po/pt_BR.po

Log Message: ----------- Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2750 of 2750)

Commit: 1d219a3435434d01068510ef8755202a76b21855 https://github.com/phpmyadmin/phpmyadmin/commit/1d219a3435434d01068510ef8755... Author: Michal Čihař michal@cihar.com Date: 2014-04-07 (Mon, 07 Apr 2014)

Changed paths: M po/ru.po

Log Message: ----------- Translated using Weblate (Russian)

Currently translated at 95.5% (2627 of 2750)

Commit: e1de0e9628e68508c1198df476fcabb0b17575ec https://github.com/phpmyadmin/phpmyadmin/commit/e1de0e9628e68508c1198df476fc... Author: Weblate noreply@weblate.org Date: 2014-04-07 (Mon, 07 Apr 2014)

Changed paths: M ChangeLog M libraries/Table.class.php M test/classes/PMA_Table_test.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

Commit: b21c43245d0d3bcf6adbea87e5a85bce1b63dc6f https://github.com/phpmyadmin/phpmyadmin/commit/b21c43245d0d3bcf6adbea87e5a8... Author: Smita Kumari kumarismita62@gmail.com Date: 2014-04-09 (Wed, 09 Apr 2014)

Changed paths: M export.php M js/export.js M libraries/display_export.lib.php

Log Message: ----------- bugfix 4346: if exeTimeLimit is set to zero then export timeout won't occur so need to check for it

Signed-off-by: Smita Kumari kumarismita62@gmail.com

Commit: cf5452afbc110da41021bceaaba6615a159fc220 https://github.com/phpmyadmin/phpmyadmin/commit/cf5452afbc110da41021bceaaba6... Author: Marc Delisle marc@infomarc.info Date: 2014-04-10 (Thu, 10 Apr 2014)

Changed paths: M export.php M js/export.js M libraries/display_export.lib.php

Log Message: ----------- Merge pull request #1131 from smita786/QA_4_1

bugfix 4346: if execTimeLimit is set to zero then export timeout won't

Commit: 6dcf2c9355f6603885aaa068d83fe50d2a892a65 https://github.com/phpmyadmin/phpmyadmin/commit/6dcf2c9355f6603885aaa068d83f... Author: Giovanni Sora g.sora@tiscali.it Date: 2014-04-10 (Thu, 10 Apr 2014)

Changed paths: M po/ia.po

Log Message: ----------- Translated using Weblate (Interlingua)

Currently translated at 43.4% (1194 of 2750)

Commit: b1cc09c16a2841f25c7b97f62ab58e91dda6504b https://github.com/phpmyadmin/phpmyadmin/commit/b1cc09c16a2841f25c7b97f62ab5... Author: Weblate noreply@weblate.org Date: 2014-04-10 (Thu, 10 Apr 2014)

Changed paths: M export.php M js/export.js M libraries/display_export.lib.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

Commit: 4e363fc47fb969f9cfab5e7a4da30f3596fb1f3b https://github.com/phpmyadmin/phpmyadmin/commit/4e363fc47fb969f9cfab5e7a4da3... Author: Marc Delisle marc@infomarc.info Date: 2014-04-10 (Thu, 10 Apr 2014)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog entry

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: abe4702d871faf1d930ea0fd77008a3a9189af25 https://github.com/phpmyadmin/phpmyadmin/commit/abe4702d871faf1d930ea0fd7700... Author: Marc Delisle marc@infomarc.info Date: 2014-04-10 (Thu, 10 Apr 2014)

Changed paths: M js/export.js M libraries/display_export.lib.php

Log Message: ----------- Fix coding style

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: f7c1399fee034fcf03fbec7cc788ecde6bae7571 https://github.com/phpmyadmin/phpmyadmin/commit/f7c1399fee034fcf03fbec7cc788... Author: Marc Delisle marc@infomarc.info Date: 2014-04-10 (Thu, 10 Apr 2014)

Changed paths: M po/ia.po

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

Commit: 4a2454c3bd013641040f6d1561f5737b8f474bf2 https://github.com/phpmyadmin/phpmyadmin/commit/4a2454c3bd013641040f6d1561f5... Author: Marc Delisle marc@infomarc.info Date: 2014-04-10 (Thu, 10 Apr 2014)

Log Message: ----------- Merge commit 'e1de0e9'

Commit: 05912b5c2cbbad1b400eff054fb115e8461e914e https://github.com/phpmyadmin/phpmyadmin/commit/05912b5c2cbbad1b400eff054fb1... Author: Marc Delisle marc@infomarc.info Date: 2014-04-10 (Thu, 10 Apr 2014)

Changed paths: M export.php M js/export.js M libraries/display_export.lib.php

Log Message: ----------- Fix merge conflict

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 8827ef7c76a44a283c85e7bcd1629994603ed804 https://github.com/phpmyadmin/phpmyadmin/commit/8827ef7c76a44a283c85e7bcd162... Author: Marc Delisle marc@infomarc.info Date: 2014-04-10 (Thu, 10 Apr 2014)

Log Message: ----------- Merge commit 'b1cc09c'

Commit: 9115548f00f1e2a2efb1a8b8c0075d876483a6b5 https://github.com/phpmyadmin/phpmyadmin/commit/9115548f00f1e2a2efb1a8b8c007... Author: Marc Delisle marc@infomarc.info Date: 2014-04-10 (Thu, 10 Apr 2014)

Changed paths: M ChangeLog M js/export.js M libraries/display_export.lib.php

Log Message: ----------- Merge commit 'abe4702'

Commit: f895eedaa6354e3c5a7b310c4b5b132bb13a6123 https://github.com/phpmyadmin/phpmyadmin/commit/f895eedaa6354e3c5a7b310c4b5b... Author: Marc Delisle marc@infomarc.info Date: 2014-04-10 (Thu, 10 Apr 2014)

Log Message: ----------- Merge commit 'f7c1399'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/47fc00dcb033...f895eedaa635