Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3b07b39c352437bf685b55b9011c565d463b8a34 https://github.com/phpmyadmin/phpmyadmin/commit/3b07b39c352437bf685b55b9011c... Author: Tim McLaughlin tim.j.mclaughlin@gmail.com Date: 2017-01-09 (Mon, 09 Jan 2017)

Changed paths: M ChangeLog M tbl_operations.php

Log Message: ----------- Fix PHP Notice 'Undefined index: row_format' when altering table options. Issue #12840 Signed-off-by: Tim McLaughlin tim.j.mclaughlin@gmail.com

Commit: f2cdfc5d00ef9f3780ac0c596062dda2a8930c64 https://github.com/phpmyadmin/phpmyadmin/commit/f2cdfc5d00ef9f3780ac0c596062... Author: Isaac Bennetch bennetch@gmail.com Date: 2017-01-19 (Thu, 19 Jan 2017)

Changed paths: M ChangeLog M tbl_operations.php

Log Message: ----------- Merge pull request #12884 from slimtim/issue_12840_v2

Fix PHP Notice 'Undefined index: row_format' when altering table options

Commit: 206a59007a085bae7a7c1440a104d2f8a68e2087 https://github.com/phpmyadmin/phpmyadmin/commit/206a59007a085bae7a7c1440a104... Author: Flavio Coelho flavio.coelho.mail@gmail.com Date: 2017-01-20 (Fri, 20 Jan 2017)

Changed paths: M po/pt.po

Log Message: ----------- Translated using Weblate (Portuguese)

Currently translated at 54.0% (1740 of 3222 strings)

[CI skip]

Commit: 9d3c265adcbf0ef16e13a7b6639bf3b16c39205c https://github.com/phpmyadmin/phpmyadmin/commit/9d3c265adcbf0ef16e13a7b6639b... Author: Weblate noreply@weblate.org Date: 2017-01-20 (Fri, 20 Jan 2017)

Changed paths: M ChangeLog M tbl_operations.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6

Commit: 8bfd77324838649d20212ef61a6aa26d3fab5199 https://github.com/phpmyadmin/phpmyadmin/commit/8bfd77324838649d20212ef61a6a... Author: Isaac Bennetch bennetch@gmail.com Date: 2017-01-19 (Thu, 19 Jan 2017)

Changed paths: M ChangeLog M tbl_operations.php

Log Message: ----------- Merge and fix conflicts from 3b07b39

Signed-off-by: Isaac Bennetch bennetch@gmail.com

Commit: 611a6442436f1ec271e8f9ca56a0f7a038490411 https://github.com/phpmyadmin/phpmyadmin/commit/611a6442436f1ec271e8f9ca56a0... Author: Isaac Bennetch bennetch@gmail.com Date: 2017-01-19 (Thu, 19 Jan 2017)

Log Message: ----------- Merge commit '9d3c265'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ac660eacc410...611a6442436f