Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5fd7b2c9dee5bfaab302650a734d5c5e491df5e8 https://github.com/phpmyadmin/phpmyadmin/commit/5fd7b2c9dee5bfaab302650a734d... Author: Michal Čihař <michal@cihar.com> Date: 2017-06-13 (Tue, 13 Jun 2017) Changed paths: M libraries/Tracker.php Log Message: ----------- Avoid getting tracking version for non tracked tables We won't use it anyway, so it's better to avoid that query. Issue #13318 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 4f30297d38685880ecbd9143f67d6cf404c6c320 https://github.com/phpmyadmin/phpmyadmin/commit/4f30297d38685880ecbd9143f67d... Author: Michal Čihař <michal@cihar.com> Date: 2017-06-13 (Tue, 13 Jun 2017) Changed paths: M ChangeLog M libraries/Tracker.php Log Message: ----------- Cache tracker enabled per table This can be executed quite a lot of times during import and there is no reason to query database again during that. Fixes #13318 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 1ecf2561a1cd73ffa11128e246ebd08bad3b756f https://github.com/phpmyadmin/phpmyadmin/commit/1ecf2561a1cd73ffa11128e246eb... Author: Michal Čihař <michal@cihar.com> Date: 2017-06-13 (Tue, 13 Jun 2017) Changed paths: M templates/export/alias_item.phtml Log Message: ----------- Unmark field as required Otherwise the hidden field blocks form submission. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 0cbe90430c6853633e095a021263c73541c60c11 https://github.com/phpmyadmin/phpmyadmin/commit/0cbe90430c6853633e095a021263... Author: Michal Čihař <michal@cihar.com> Date: 2017-06-13 (Tue, 13 Jun 2017) Changed paths: M ChangeLog M libraries/Tracker.php M templates/export/alias_item.phtml Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c218e5e025ee...0cbe90430c68