[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e7d47e: Fix #13864 - prevent resetting of enum fields

[Jayati Shrivastava]

Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: e7d47e840e3ca22204227c12301371f5ad830bdb
https://github.com/phpmyadmin/phpmyadmin/commit/e7d47e840e3ca22204227c12301371f5ad830bdb
Author: Jayati Shrivastava <gaurijove at gmail.com>
Date: 2020-01-19 (Sun, 01 January 2020) +01:00

Changed paths: 
M js/table/change.js

Log Message:
-----------
Fix #13864 - prevent resetting of enum fields

Fixes: #13864

Signed-off-by: Jayati Shrivastava <gaurijove at gmail.com>

Commit: d0ae286b9d9e8ea1d8224914fe4c34d28cc62a61
https://github.com/phpmyadmin/phpmyadmin/commit/d0ae286b9d9e8ea1d8224914fe4c34d28cc62a61
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-01-19 (Sun, 01 January 2020) +01:00

Changed paths: 
M js/table/change.js

Log Message:
-----------
Merge #15657 - Fix #13864 - prevent resetting of enum fields

Fixes: #13864
Pull-request: #15657
Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: 6812f54ce32e1ded21b25c544b5e294147d10b13
https://github.com/phpmyadmin/phpmyadmin/commit/6812f54ce32e1ded21b25c544b5e294147d10b13
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-01-19 (Sun, 01 January 2020) +01:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add ChangeLog entry for #13864



Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: 67f6f2b69c162a27ab2531b50d9b433892c69f83
https://github.com/phpmyadmin/phpmyadmin/commit/67f6f2b69c162a27ab2531b50d9b433892c69f83
Author: Rahul Gurung <gurungrahul2 at gmail.com>
Date: 2020-01-19 (Sun, 01 January 2020) +01:00

Changed paths: 
M templates/sql/relational_column_dropdown.twig

Log Message:
-----------
fixed browse foreign values modal with grid edit

Signed-off-by: Rahul Gurung <gurungrahul2 at gmail.com>

Commit: 448e6557a0b7f6e693a1352dc451038ba66c96af
https://github.com/phpmyadmin/phpmyadmin/commit/448e6557a0b7f6e693a1352dc451038ba66c96af
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-01-19 (Sun, 01 January 2020) +01:00

Changed paths: 
M templates/sql/relational_column_dropdown.twig

Log Message:
-----------
Merge #15819 - Fix #15811 - Browse foreign values doesn't work with grid edit

Fixes: #15811
Pull-request: #15819
Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: 899a63d2ceb193e1b84a287ea91ffa04edc10b91
https://github.com/phpmyadmin/phpmyadmin/commit/899a63d2ceb193e1b84a287ea91ffa04edc10b91
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-01-19 (Sun, 01 January 2020) +01:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add ChangeLog entry for #15811

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: 3a947706bff84ca054a679acd4e060e3def32399
https://github.com/phpmyadmin/phpmyadmin/commit/3a947706bff84ca054a679acd4e060e3def32399
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-01-19 (Sun, 01 January 2020) +01:00

Changed paths: 
M ChangeLog
M js/table/change.js
M templates/sql/relational_column_dropdown.twig

Log Message:
-----------
Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes at wdes.fr>