Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: edde7126ce234cad5fa3a6ee39355434cc2fc0ac https://github.com/phpmyadmin/phpmyadmin/commit/edde7126ce234cad5fa3a6ee3935... Author: Marc Delisle marc@infomarc.info Date: 2013-12-25 (Wed, 25 Dec 2013)
Changed paths: M export.php A libraries/export.lib.php M test/classes/plugin/export/PMA_ExportCodegen_test.php
Log Message: ----------- Move functions to library file
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 4d913bb0090c6ee6cd19f77bb9e85fa28295c0a1 https://github.com/phpmyadmin/phpmyadmin/commit/4d913bb0090c6ee6cd19f77bb9e8... Author: Marc Delisle marc@infomarc.info Date: 2013-12-25 (Wed, 25 Dec 2013)
Changed paths: M export.php M libraries/export.lib.php
Log Message: ----------- Refactor: new PMA_getHtmlForDisplayedExportFooter()
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: d40e238e938fbf2ef8ec3bd601454e5315a5d5f5 https://github.com/phpmyadmin/phpmyadmin/commit/d40e238e938fbf2ef8ec3bd60145... Author: Marc Delisle marc@infomarc.info Date: 2013-12-25 (Wed, 25 Dec 2013)
Changed paths: M export.php M libraries/export.lib.php
Log Message: ----------- Refactor: new PMA_getMemoryLimitForExport()
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 33b180e9d81d2e52726a27df9bbc4e08eda74024 https://github.com/phpmyadmin/phpmyadmin/commit/33b180e9d81d2e52726a27df9bbc... Author: Marc Delisle marc@infomarc.info Date: 2013-12-25 (Wed, 25 Dec 2013)
Changed paths: M ChangeLog M README M README.rst M doc/config.rst M js/chart.js M js/tbl_chart.js M libraries/StorageEngine.class.php M libraries/config.values.php A libraries/config/ServerConfigChecks.class.php M libraries/config/messages.inc.php M libraries/config/user_preferences.forms.php M libraries/engines/binlog.lib.php M libraries/engines/innobase.lib.php M libraries/engines/mrg_myisam.lib.php M libraries/engines/performance_schema.lib.php M libraries/properties/plugins/ExportPluginProperties.class.php M libraries/properties/plugins/ImportPluginProperties.class.php M libraries/properties/plugins/PluginPropertyItem.class.php M libraries/tbl_chart.lib.php M po/en_GB.po M po/pt.po M po/ro.po M po/zh_TW.po M setup/frames/index.inc.php M setup/lib/index.lib.php R test/classes/properties/PMA_PorpertyItem_test.php A test/classes/properties/PMA_PropertyItem_test.php R test/classes/properties/plugins/PMA_PluginPorpertyItem_test.php A test/classes/properties/plugins/PMA_PluginPropertyItem_test.php M test/engines/PMA_StorageEngine_mrg_myisam_test.php M test/libraries/PMA_SetupIndex_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9ed6ae9931a5...33b180e9d81d