Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1aedeefc434b046d82a4131abf5447025e597f55 https://github.com/phpmyadmin/phpmyadmin/commit/1aedeefc434b046d82a4131abf54... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2013-11-03 (Sun, 03 Nov 2013) Changed paths: M libraries/mult_submits.lib.php M libraries/sql.lib.php Log Message: ----------- Update start position after a delete. Commit: d3adbcaf05056158e85ee299c4fc8d5e35b528c6 https://github.com/phpmyadmin/phpmyadmin/commit/d3adbcaf05056158e85ee299c4fc... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2013-11-03 (Sun, 03 Nov 2013) Changed paths: M libraries/mult_submits.lib.php M libraries/sql.lib.php Log Message: ----------- Fix calculation of pos after delete. Commit: 4c5f8ce58444d2ff91e1ad0d4c3210487722d9fa https://github.com/phpmyadmin/phpmyadmin/commit/4c5f8ce58444d2ff91e1ad0d4c32... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2013-11-03 (Sun, 03 Nov 2013) Changed paths: M libraries/config/ConfigFile.class.php M libraries/config/Form.class.php M libraries/config/FormDisplay.class.php M libraries/config/Validator.class.php M libraries/core.lib.php M libraries/navigation/Nodes/Node.class.php M libraries/user_preferences.lib.php M setup/config.php M setup/lib/ConfigGenerator.class.php M test/AllSeleniumTests.php M test/classes/PMA_Advisor_test.php M test/classes/PMA_DBQbe_test.php M test/classes/PMA_File_test.php M test/classes/PMA_List_Database_test.php M test/classes/PMA_Message_test.php M test/classes/PMA_PDF_test.php M test/classes/PMA_Scripts_test.php M test/classes/PMA_Table_test.php M test/classes/PMA_Theme_Manager_test.php M test/classes/PMA_Theme_test.php M test/classes/PMA_Types_Drizzle_test.php M test/classes/config/PMA_Form_test.php M test/classes/dbi/DBIDrizzle_test.php M test/classes/dbi/DBIMysql_test.php M test/classes/navigation/PMA_NodeFactory_test.php M test/classes/navigation/PMA_Node_Column_Container_test.php M test/classes/navigation/PMA_Node_Column_test.php M test/classes/navigation/PMA_Node_Event_Container_test.php M test/classes/navigation/PMA_Node_Event_test.php M test/classes/navigation/PMA_Node_Function_Container_test.php M test/classes/navigation/PMA_Node_Function_test.php M test/classes/navigation/PMA_Node_Index_Container_test.php M test/classes/navigation/PMA_Node_Index_test.php M test/classes/navigation/PMA_Node_Procedure_Container_test.php M test/classes/navigation/PMA_Node_Procedure_test.php M test/classes/navigation/PMA_Node_Trigger_Container_test.php M test/classes/navigation/PMA_Node_Trigger_test.php M test/classes/navigation/PMA_Node_test.php M test/classes/plugin/PMA_PluginManager_test.php M test/classes/plugin/auth/PMA_AuthenticationConfig_test.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php M test/classes/plugin/auth/PMA_AuthenticationSignon_test.php M test/classes/plugin/export/PMA_ExportExcel_test.php M test/classes/plugin/export/PMA_ExportSql_test.php M test/classes/plugin/export/PMA_ExportTexytext_test.php M test/classes/plugin/export/PMA_ExportXml_test.php M test/classes/plugin/export/PMA_ExportYaml_test.php M test/classes/plugin/export/PMA_TableProperty_test.php M test/classes/plugin/import/ImportMediawiki_test.php M test/classes/plugin/import/ImportSql_test.php M test/classes/plugin/import/ImportXml_test.php M test/classes/plugin/transformations/Image_PNG_Inline_test.php M test/classes/plugin/transformations/Text_Plain_Append_test.php M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php M test/classes/plugin/transformations/Text_Plain_External_test.php M test/classes/plugin/transformations/Text_Plain_Imagelink_test.php M test/classes/plugin/transformations/Text_Plain_Longtoipv4_test.php M test/classes/plugin/transformations/Text_Plain_Substring_test.php M test/classes/properties/PMA_PorpertyItem_test.php M test/classes/properties/options/PMA_OptionsPropertyGroup_test.php M test/classes/properties/options/PMA_OptionsPropertyItem_test.php M test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php M test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php M test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php M test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php M test/classes/properties/options/items/PMA_PropertyItems_test.php M test/classes/properties/plugins/PMA_ExportPluginProperties_test.php M test/classes/properties/plugins/PMA_ImportPluginProperties_test.php M test/classes/properties/plugins/PMA_PluginPorpertyItem_test.php M test/classes/schema/Dia_Relation_Schema_test.php M test/classes/schema/Eps_Relation_Schema_test.php M test/classes/schema/Pdf_Relation_Schema_test.php M test/classes/schema/Svg_Relation_Schema_test.php M test/classes/schema/Svg_test.php M test/classes/schema/User_Schema_test.php M test/engines/PMA_StorageEngine_pbxt_test.php M test/libraries/PMA_ConfigFile_test.php M test/libraries/PMA_SetupIndex_test.php Log Message: ----------- Merge branch 'master' into fix-4134-v2 Commit: 12f1627656a1315690c6869015ef4953213b3373 https://github.com/phpmyadmin/phpmyadmin/commit/12f1627656a1315690c6869015ef... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2013-11-03 (Sun, 03 Nov 2013) Changed paths: M libraries/sql.lib.php M test/libraries/PMA_mult_submits_test.php Log Message: ----------- Fix repositioning after delete. Fix test related to repositioning. Commit: 26bea3f1049cbbca4a06c9b45431cae6a1b9153f https://github.com/phpmyadmin/phpmyadmin/commit/26bea3f1049cbbca4a06c9b45431... Author: Marc Delisle <marc@infomarc.info> Date: 2013-11-05 (Tue, 05 Nov 2013) Changed paths: M libraries/mult_submits.lib.php M libraries/sql.lib.php M test/libraries/PMA_mult_submits_test.php Log Message: ----------- Merge remote branch 'tithugues/fix-4134' Commit: 5cb21ef969a497b7996c840f16c25d7d47008d75 https://github.com/phpmyadmin/phpmyadmin/commit/5cb21ef969a497b7996c840f16c2... Author: Marc Delisle <marc@infomarc.info> Date: 2013-11-05 (Tue, 05 Nov 2013) Changed paths: M libraries/sql.lib.php Log Message: ----------- Fix coding style Commit: 32e237c15b2d2831f683be34d74a4eda603e727c https://github.com/phpmyadmin/phpmyadmin/commit/32e237c15b2d2831f683be34d74a... Author: Marc Delisle <marc@infomarc.info> Date: 2013-11-05 (Tue, 05 Nov 2013) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for bug 4134 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/57ef25eed8b4...32e237c15b2d