Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c86acbf3ed49f69cf38b31879886dd5eb86b6983 https://github.com/phpmyadmin/phpmyadmin/commit/c86acbf3ed49f69cf38b31879886... Author: William Desportes williamdes@wdes.fr Date: 2020-01-01 (Wed, 01 January 2020) +01:00

Changed paths: M libraries/classes/Server/Privileges.php

Log Message: ----------- Fix sql injection in user exists request

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

Commit: ce10567b748aefe68fe873d081b3eeb68dafb1f9 https://github.com/phpmyadmin/phpmyadmin/commit/ce10567b748aefe68fe873d081b3... Author: Isaac Bennetch bennetch@gmail.com Date: 2020-01-07 (Tue, 01 January 2020) -05:00

Changed paths: M libraries/classes/Server/Privileges.php

Log Message: ----------- Merge remote-tracking branch 'security/fix/293-sql-injection' into QA_4_9

Commit: fa53b374ad35d67e4ebc83cd6ca50034ef0e48a9 https://github.com/phpmyadmin/phpmyadmin/commit/fa53b374ad35d67e4ebc83cd6ca5... Author: Isaac Bennetch bennetch@gmail.com Date: 2020-01-07 (Tue, 01 January 2020) -05:00

Changed paths: M ChangeLog M README M doc/conf.py M libraries/classes/Config.php M package.json

Log Message: ----------- Prepare for version 4.9.4

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

Commit: dc1e81e6b2f62292e496a3c97ecd079a46af1ea7 https://github.com/phpmyadmin/phpmyadmin/commit/dc1e81e6b2f62292e496a3c97ecd... Author: Isaac Bennetch bennetch@gmail.com Date: 2020-01-07 (Tue, 01 January 2020) -05:00

Changed paths: M ChangeLog M README M doc/conf.py M libraries/classes/Config.php M libraries/classes/Server/Privileges.php M package.json

Log Message: ----------- Fix merge conflicts from QA_4_9 and prepare for 5.0.1

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

Commit: 645989e87a22c46196fa7e1afae638dc07353bdf https://github.com/phpmyadmin/phpmyadmin/commit/645989e87a22c46196fa7e1afae6... Author: Isaac Bennetch bennetch@gmail.com Date: 2020-01-07 (Tue, 01 January 2020) -05:00

Changed paths: A composer.lock

Log Message: ----------- Adding composer lock for 5.0.1

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

Commit: 8c2b30bd1fb9cd78081e3ce7a12c20c6d030efa1 https://github.com/phpmyadmin/phpmyadmin/commit/8c2b30bd1fb9cd78081e3ce7a12c... Author: Isaac Bennetch bennetch@gmail.com Date: 2020-01-07 (Tue, 01 January 2020) -05:00

Changed paths: D composer.lock

Log Message: ----------- Removing composer.lock

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

Commit: f8412ea63346476bf5b9d82af9940023494ef78e https://github.com/phpmyadmin/phpmyadmin/commit/f8412ea63346476bf5b9d82af994... Author: Isaac Bennetch bennetch@gmail.com Date: 2020-01-07 (Tue, 01 January 2020) -05:00

Changed paths: M README M doc/conf.py M libraries/classes/Config.php M package.json

Log Message: ----------- Prepare for version 5.0.2-dev

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

Commit: a89f3fe7508243af0865ee4c8739d6b68e0e9893 https://github.com/phpmyadmin/phpmyadmin/commit/a89f3fe7508243af0865ee4c8739... Author: Isaac Bennetch bennetch@gmail.com Date: 2020-01-08 (Wed, 01 January 2020) -05:00

Changed paths: M ChangeLog M libraries/classes/Server/Privileges.php

Log Message: ----------- Fix merge conflicts

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