Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bfc61051b78f562914d12b60e0ae94dd131c2ba0 https://github.com/phpmyadmin/phpmyadmin/commit/bfc61051b78f562914d12b60e0ae... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-20 (Thu, 20 Nov 2014)

Changed paths: M ChangeLog M libraries/relation.lib.php

Log Message: ----------- bug #4603 Field disabled when internal relations used

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: a0b60e090180cf3dd6fd0d47b77aa0127b3c1434 https://github.com/phpmyadmin/phpmyadmin/commit/a0b60e090180cf3dd6fd0d47b77a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-20 (Thu, 20 Nov 2014)

Changed paths: M ChangeLog M libraries/relation.lib.php M libraries/tbl_columns_definition_form.inc.php

Log Message: ----------- Merge branch 'QA_4_2' into QA_4_3

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 9b61294ed8f9ac3b5d74fe198f5cb7dbe1f49f05 https://github.com/phpmyadmin/phpmyadmin/commit/9b61294ed8f9ac3b5d74fe198f5c... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-20 (Thu, 20 Nov 2014)

Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/relation.lib.php M libraries/tbl_columns_definition_form.inc.php M tbl_export.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

Log Message: ----------- Merge branch 'QA_4_3'

Commit: 095bdd842d739fb1a59d5de607b71704fb0b8417 https://github.com/phpmyadmin/phpmyadmin/commit/095bdd842d739fb1a59d5de607b7... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-20 (Thu, 20 Nov 2014)

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ed5fc179f497...095bdd842d73