Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e462bd8ffc59d436a694e4c89a17dceb32313f87 https://github.com/phpmyadmin/phpmyadmin/commit/e462bd8ffc59d436a694e4c89a17... Author: William Desportes williamdes@wdes.fr Date: 2021-03-31 (Wed, 03 March 2021) +02:00

Changed paths: M js/src/makegrid.js

Log Message: ----------- Fix #16765 - Revert "55880451eb193f7e1bad90df365b67d54eded5a6"

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 5ea30cb8ba73eb14573933f1baf471cb44300463 https://github.com/phpmyadmin/phpmyadmin/commit/5ea30cb8ba73eb14573933f1baf4... Author: Saksham Gupta shucon01@gmail.com Date: 2021-03-31 (Wed, 03 March 2021) +05:30

Changed paths: M js/src/rte.js

Log Message: ----------- Fix #16780 New event shows an empty row

Signed-off-by: Saksham Gupta shucon01@gmail.com

Commit: 4d2c311b59d5ee3cc84277043b46218c47fca540 https://github.com/phpmyadmin/phpmyadmin/commit/4d2c311b59d5ee3cc84277043b46... Author: William Desportes williamdes@wdes.fr Date: 2021-03-31 (Wed, 03 March 2021) +02:00

Changed paths: M libraries/classes/Display/Results.php M phpstan-baseline.neon M psalm-baseline.xml

Log Message: ----------- Fix some phpdoc blocks on Results class

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 74e1f2cdf96adb9071ffaf0ed0d462a8b3def9e0 https://github.com/phpmyadmin/phpmyadmin/commit/74e1f2cdf96adb9071ffaf0ed0d4... Author: William Desportes williamdes@wdes.fr Date: 2021-03-31 (Wed, 03 March 2021) +02:00

Changed paths: M js/src/rte.js

Log Message: ----------- Merge #16782 - Fix #16780 New event shows an empty row Pull-request: #16782 Fixes: #16780

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 86232c3b92054822bd5c0f17c6aac3e5864eeca0 https://github.com/phpmyadmin/phpmyadmin/commit/86232c3b92054822bd5c0f17c6aa... Author: William Desportes williamdes@wdes.fr Date: 2021-03-31 (Wed, 03 March 2021) +02:00

Changed paths: M ChangeLog

Log Message: ----------- Add a ChangeLog entry for #16780 and #16765

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: c70552651f6455b45674fa2620d94b9d1c7ea3f2 https://github.com/phpmyadmin/phpmyadmin/commit/c70552651f6455b45674fa2620d9... Author: William Desportes williamdes@wdes.fr Date: 2021-03-31 (Wed, 03 March 2021) +02:00

Changed paths: M ChangeLog M js/src/database/routines.js M js/src/makegrid.js M libraries/classes/Display/Results.php M phpstan-baseline.neon M psalm-baseline.xml

Log Message: ----------- Merge branch 'QA_5_1'

Signed-off-by: William Desportes williamdes@wdes.fr