Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 352a5d79d5e429b8bd94e076155be452e2cac19f https://github.com/phpmyadmin/phpmyadmin/commit/352a5d79d5e429b8bd94e076155b... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-12-15 (Thu, 15 Dec 2016)

Changed paths: M js/rte.js M libraries/rte/rte_routines.lib.php

Log Message: ----------- MySQL allows precision to be specified for DATETIME, TIME type fields too

Fix #12814

Ref : http://dev.mysql.com/doc/refman/5.7/en/fractional-seconds.html

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: 967755a1de0d56adf75acb764943b3ce9142b584 https://github.com/phpmyadmin/phpmyadmin/commit/967755a1de0d56adf75acb764943... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-12-15 (Thu, 15 Dec 2016)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog for #12814

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: c8a15f22123cebd6ba939bab222091c14de8fce2 https://github.com/phpmyadmin/phpmyadmin/commit/c8a15f22123cebd6ba939bab2220... Author: Michal Čihař michal@cihar.com Date: 2016-12-20 (Tue, 20 Dec 2016)

Changed paths: M ChangeLog M js/rte.js M libraries/rte/rte_routines.lib.php

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

Commit: b1ad3826b5efe1fde6bd3aa8886f4409c00fdb68 https://github.com/phpmyadmin/phpmyadmin/commit/b1ad3826b5efe1fde6bd3aa8886f... Author: Michal Čihař michal@cihar.com Date: 2016-12-20 (Tue, 20 Dec 2016)

Changed paths: M ChangeLog M js/rte.js M libraries/rte/rte_routines.lib.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/73c6a7eb9f8d...b1ad3826b5ef