Branch: refs/heads/QA_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0aeb0963aed7f252006e091c05baa3d5272d4c11 https://github.com/phpmyadmin/phpmyadmin/commit/0aeb0963aed7f252006e091c05ba... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2019-07-28 (Sun, 07 July 2019) +02:00 Changed paths: M libraries/classes/Import.php Log Message: ----------- Fix #15388 Allow rollback if empty statement When statement finishes with spaces, there is an "empty" statement. An empty statement is rollbackable. Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com> Commit: 20735aeff00eeed6ae3e53db04cdc101c3e843cf https://github.com/phpmyadmin/phpmyadmin/commit/20735aeff00eeed6ae3e53db04cd... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2019-08-02 (Fri, 08 August 2019) +02:00 Changed paths: M libraries/classes/Display/Results.php Log Message: ----------- Fix #14291 Incorrect linkage from one table's value to another table Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com> Commit: 02225781f25b75bdaf8535587d76840e56ab46bc https://github.com/phpmyadmin/phpmyadmin/commit/02225781f25b75bdaf8535587d76... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2019-08-02 (Fri, 08 August 2019) +02:00 Changed paths: M libraries/classes/Display/Results.php Log Message: ----------- Add missing PHPDoc for new $displayedData parameter Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com> Commit: c36a2cef021cf19ade0334bccf2740b2a570b9ac https://github.com/phpmyadmin/phpmyadmin/commit/c36a2cef021cf19ade0334bccf27... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2019-08-15 (Thu, 08 August 2019) +02:00 Changed paths: M libraries/classes/InsertEdit.php Log Message: ----------- Fix #15363 Remove unexpected quotes on text fields Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com> Commit: b4d3b07476fdcc4893cc41bf9f85dad2fdede090 https://github.com/phpmyadmin/phpmyadmin/commit/b4d3b07476fdcc4893cc41bf9f85... Author: William Desportes <williamdes@wdes.fr> Date: 2019-08-15 (Thu, 08 August 2019) +02:00 Changed paths: M libraries/classes/Controllers/Table/TableStructureController.php M libraries/classes/InsertEdit.php M libraries/tbl_columns_definition_form.inc.php Log Message: ----------- Fix #15363 - Remove unexpected quotes on text fields Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 98a7479174a081ac60419034151fd89ec952265f https://github.com/phpmyadmin/phpmyadmin/commit/98a7479174a081ac60419034151f... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2019-08-19 (Mon, 08 August 2019) +02:00 Changed paths: M libraries/classes/Controllers/Table/TableStructureController.php M libraries/classes/Table.php M templates/columns_definitions/column_null.twig Log Message: ----------- Fix NULL wrongly checked on field change When a field was requested to be changed, the "null" field was compared to its previous value. Unfortunately, both fields don't have the same value, so a change was always identified. Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com> Commit: 6f14206810f9eee273a32051079f2ee2f9e196df https://github.com/phpmyadmin/phpmyadmin/commit/6f14206810f9eee273a32051079f... Author: William Desportes <williamdes@wdes.fr> Date: 2019-08-20 (Tue, 08 August 2019) +02:00 Changed paths: M libraries/classes/Controllers/Table/TableStructureController.php M libraries/classes/InsertEdit.php M libraries/tbl_columns_definition_form.inc.php Log Message: ----------- Fix #15363 - Remove unexpected quotes on text fields Fixes: #15363 Pull-request: #15409 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: bef259c5100b06ceb24caa49ff19d649c6cdf94f https://github.com/phpmyadmin/phpmyadmin/commit/bef259c5100b06ceb24caa49ff19... Author: William Desportes <williamdes@wdes.fr> Date: 2019-08-20 (Tue, 08 August 2019) +02:00 Changed paths: M libraries/classes/Controllers/Table/TableStructureController.php M libraries/classes/Table.php M templates/columns_definitions/column_null.twig Log Message: ----------- Fix NULL wrongly checked on field change Pull-request: #15445 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: c4640c64b307b25f56e82e8e0ea66684c4b0d2ea https://github.com/phpmyadmin/phpmyadmin/commit/c4640c64b307b25f56e82e8e0ea6... Author: William Desportes <williamdes@wdes.fr> Date: 2019-08-20 (Tue, 08 August 2019) +02:00 Changed paths: M libraries/classes/Import.php Log Message: ----------- Fix #15388 - Allow rollback if empty statement Fixes: #15388 Pull-request: #15408 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 62a17fea451eaf0c78c0e0fd850f9e2fc66407a4 https://github.com/phpmyadmin/phpmyadmin/commit/62a17fea451eaf0c78c0e0fd850f... Author: William Desportes <williamdes@wdes.fr> Date: 2019-08-20 (Tue, 08 August 2019) +02:00 Changed paths: M libraries/classes/Display/Results.php Log Message: ----------- Fix #14291 - Incorrect linkage from one table's value to another table Fixes: #14291 Pull-request: #15414 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: fff26ed9391fb69134d965e52bf493b88303c5d6 https://github.com/phpmyadmin/phpmyadmin/commit/fff26ed9391fb69134d965e52bf4... Author: William Desportes <williamdes@wdes.fr> Date: 2019-08-20 (Tue, 08 August 2019) +02:00 Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog entries for #15363, bef259c5, #15388, #14291 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: f428277bad851848d29973e94c05beb32ad9511d https://github.com/phpmyadmin/phpmyadmin/commit/f428277bad851848d29973e94c05... Author: William Desportes <williamdes@wdes.fr> Date: 2019-08-20 (Tue, 08 August 2019) +02:00 Changed paths: M ChangeLog M libraries/classes/Controllers/Table/StructureController.php M libraries/classes/CreateAddField.php M libraries/classes/Display/Results.php M libraries/classes/Import.php M libraries/classes/InsertEdit.php M libraries/classes/LanguageManager.php M libraries/classes/Table.php M libraries/tbl_columns_definition_form.inc.php M phpstan.neon.dist M templates/columns_definitions/column_null.twig Log Message: ----------- Merge branch 'QA_4_9' into 'QA_5_0' Signed-off-by: William Desportes <williamdes@wdes.fr>