Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fa88c27ad61448a474d30d26f52291be9775e773 https://github.com/phpmyadmin/phpmyadmin/commit/fa88c27ad61448a474d30d26f522... Author: Aditya Sastry ganeshaditya1@gmail.com Date: 2014-03-22 (Sat, 22 Mar 2014)

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

Log Message: ----------- Adds the maximum table size to export option (Feature request 1515)

Added a textbox to the custom export options, in the loop where the Exporting is done, I added a query which checks the current table's size. If this size is greater than the limit specified we don't export the current table.

Signed-off-by: Aditya Sastry ganeshaditya1@gmail.com

Commit: 22befe05095aac79b38d8b23878769c1e5814357 https://github.com/phpmyadmin/phpmyadmin/commit/22befe05095aac79b38d8b238787... Author: Marc Delisle marc@infomarc.info Date: 2014-03-24 (Mon, 24 Mar 2014)

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

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

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

Commit: 6a478282109dacf48e84d094c91012308b7439c3 https://github.com/phpmyadmin/phpmyadmin/commit/6a478282109dacf48e84d094c910... Author: Marc Delisle marc@infomarc.info Date: 2014-03-24 (Mon, 24 Mar 2014)

Changed paths: M libraries/display_export.lib.php

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

- localize the size suffix - improve XHTML - the label needs an id - add a todo

Commit: 9d4082ad9303544ed6248311f728e256c91f95fb https://github.com/phpmyadmin/phpmyadmin/commit/9d4082ad9303544ed6248311f728... Author: Marc Delisle marc@infomarc.info Date: 2014-03-24 (Mon, 24 Mar 2014)

Changed paths: M ChangeLog

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

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/81ed63a201ac...9d4082ad9303