Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8e8b7df45000e04770e69ce20745238a33fbc166 https://github.com/phpmyadmin/phpmyadmin/commit/8e8b7df45000e04770e69ce20745... Author: Saksham Gupta shucon01@gmail.com Date: 2021-01-28 (Thu, 01 January 2021) +05:30

Changed paths: M libraries/classes/Util.php M test/classes/UtilTest.php

Log Message: ----------- Fixes: https://github.com/phpmyadmin/phpmyadmin/issues/15389

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

Add Unit Test

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

Fix Lint

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

Add comment

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

Commit: dc5843dc2ea2c7d15a65311621a7e4dead032424 https://github.com/phpmyadmin/phpmyadmin/commit/dc5843dc2ea2c7d15a65311621a7... Author: Saksham Gupta shucon01@gmail.com Date: 2021-02-05 (Fri, 02 February 2021) +05:30

Changed paths: M templates/table/relation/foreign_key_row.twig M templates/table/relation/relational_dropdown.twig

Log Message: ----------- Fix: #16612 - Empty relation view table dropdown

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

Changes in twig

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

Remove comments

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

Commit: 3b49d32f44355108ea40f31eaa5b226b8997d30f https://github.com/phpmyadmin/phpmyadmin/commit/3b49d32f44355108ea40f31eaa5b... Author: William Desportes williamdes@wdes.fr Date: 2021-02-09 (Tue, 02 February 2021) +01:00

Changed paths: M templates/table/relation/foreign_key_row.twig M templates/table/relation/relational_dropdown.twig

Log Message: ----------- Merge #16615 - Fix #16612 - Empty relation view table dropdown

Pull-request: #16615 Fixes: #16612

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

Commit: e71102a4550b6c770293b418e56ea21cf180e30e https://github.com/phpmyadmin/phpmyadmin/commit/e71102a4550b6c770293b418e56e... Author: William Desportes williamdes@wdes.fr Date: 2021-02-09 (Tue, 02 February 2021) +01:00

Changed paths: M libraries/classes/Util.php M test/classes/UtilTest.php

Log Message: ----------- Merge #16597 - Fix #15389 - reset current page indicator after deleting all rows to current page and not page 1

Pull-request: #16597 Fixes: #15389

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

Commit: d9c4be4454cbcc81ae5c6388181137ebafbbee07 https://github.com/phpmyadmin/phpmyadmin/commit/d9c4be4454cbcc81ae5c63881811... Author: William Desportes williamdes@wdes.fr Date: 2021-02-09 (Tue, 02 February 2021) +01:00

Changed paths: M ChangeLog

Log Message: ----------- Add a ChangeLog entry for #15389

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

Commit: 471d104852b09f3e21639153cf0262b7f5efa750 https://github.com/phpmyadmin/phpmyadmin/commit/471d104852b09f3e21639153cf02... Author: William Desportes williamdes@wdes.fr Date: 2021-02-09 (Tue, 02 February 2021) +01:00

Changed paths: M ChangeLog M libraries/classes/Util.php M templates/table/relation/foreign_key_row.twig M templates/table/relation/relational_dropdown.twig M test/classes/UtilTest.php

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

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