Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 508f0a752b372539dd8dd2e045988a292c75e15d https://github.com/phpmyadmin/phpmyadmin/commit/508f0a752b372539dd8dd2e04598... Author: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Date: 2014-08-01 (Fri, 01 Aug 2014) Changed paths: M db_datadict.php M doc/faq.rst M js/tbl_relation.js M libraries/DatabaseInterface.class.php M libraries/DisplayResults.class.php M libraries/Table.class.php M libraries/TableSearch.class.php M libraries/insert_edit.lib.php M libraries/plugins/ExportPlugin.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/export/ExportSql.class.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/schema/Dia_Relation_Schema.class.php M libraries/schema/Eps_Relation_Schema.class.php M libraries/schema/Pdf_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php M libraries/tbl_printview.lib.php M libraries/tbl_relation.lib.php M pmd_relation_new.php M pmd_relation_upd.php M tbl_operations.php M tbl_relation.php M test/classes/PMA_DbSearch_test.php M test/classes/plugin/export/PMA_ExportLatex_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_relation_test.php M test/libraries/PMA_tbl_relation_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- RFE#919: Multiple-column foreign key relation. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Fix missing master column. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Fix failing test. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Fix coding styles. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Fix function doc. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Fix coding styles. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Commit: 41f2ecf87bf6789ccd140b01a8c6a2fb08a53c1c https://github.com/phpmyadmin/phpmyadmin/commit/41f2ecf87bf6789ccd140b01a8c6... Author: Marc Delisle <marc@infomarc.info> Date: 2014-08-01 (Fri, 01 Aug 2014) Changed paths: M db_datadict.php M doc/faq.rst M js/tbl_relation.js M libraries/DatabaseInterface.class.php M libraries/DisplayResults.class.php M libraries/Table.class.php M libraries/TableSearch.class.php M libraries/insert_edit.lib.php M libraries/plugins/ExportPlugin.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/export/ExportSql.class.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/schema/Dia_Relation_Schema.class.php M libraries/schema/Eps_Relation_Schema.class.php M libraries/schema/Pdf_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php M libraries/tbl_printview.lib.php M libraries/tbl_relation.lib.php M pmd_relation_new.php M pmd_relation_upd.php M tbl_operations.php M tbl_relation.php M test/classes/PMA_DbSearch_test.php M test/classes/plugin/export/PMA_ExportLatex_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_relation_test.php M test/libraries/PMA_tbl_relation_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge pull request #1307 from ashutoshdhundhara/rfe_919 RFE#919: Multiple-column foreign key relation. Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6d7171ba0780...41f2ecf87bf6