Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8035d00773225e09681acf2164714599d2e1e763 https://github.com/phpmyadmin/phpmyadmin/commit/8035d00773225e09681acf216471... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-12-15 (Mon, 15 Dec 2014)

Changed paths: M ChangeLog M js/tbl_relation.js M libraries/tbl_relation.lib.php

Log Message: ----------- Implement #1579 Default to primary key when adding relation.

Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com

Commit: 3d3d0050cf18b66d7a04a153908680490e4f569e https://github.com/phpmyadmin/phpmyadmin/commit/3d3d0050cf18b66d7a04a1539086... Author: Marc Delisle marc@infomarc.info Date: 2014-12-16 (Tue, 16 Dec 2014)

Changed paths: M ChangeLog M js/tbl_relation.js M libraries/tbl_relation.lib.php

Log Message: ----------- Merge remote-tracking branch 'Tithugues/r1579_master'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5c73d45fa8fe...3d3d0050cf18