[phpMyAdmin Git] [phpmyadmin/phpmyadmin] deeb51: Fix #12241 Remove alias removal

[Hugues Peccatte]

Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: deeb5156b996e27668435f8284f91350c0427896
https://github.com/phpmyadmin/phpmyadmin/commit/deeb5156b996e27668435f8284f91350c0427896
Author: Hugues Peccatte <hugues.peccatte at gmail.com>
Date: 2019-11-02 (Sat, 11 November 2019) +01:00

Changed paths: 
M tbl_export.php

Log Message:
-----------
Fix #12241 Remove alias removal

In former versions, export on queries was available only for queries with one single table. This is not true anymore, so we should keep the aliases.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>

Commit: 11d8af138f03bbd27c76c263137deb3efdfe47b0
https://github.com/phpmyadmin/phpmyadmin/commit/11d8af138f03bbd27c76c263137deb3efdfe47b0
Author: Hugues Peccatte <hugues.peccatte at gmail.com>
Date: 2019-11-02 (Sat, 11 November 2019) +01:00

Changed paths: 
M tbl_export.php

Log Message:
-----------
Fix #15316 CROSS JOIN clause is removed on export

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>

Commit: e9ad2bc153c8e7c6a079aa6f12ddca590451d40c
https://github.com/phpmyadmin/phpmyadmin/commit/e9ad2bc153c8e7c6a079aa6f12ddca590451d40c
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-11-09 (Sat, 11 November 2019) +01:00

Changed paths: 
M libraries/classes/Controllers/Table/TableStructureController.php

Log Message:
-----------
Fix #14951 - Moving Columns with type INT and default CURRENT_TIMESTAMP

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

Commit: 8aad190ae035ec36db9376375473c709c6341fb0
https://github.com/phpmyadmin/phpmyadmin/commit/8aad190ae035ec36db9376375473c709c6341fb0
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-11-09 (Sat, 11 November 2019) +01:00

Changed paths: 
M libraries/classes/Controllers/Table/TableStructureController.php
M libraries/classes/CreateAddField.php

Log Message:
-----------
Fix #14951 - Moving Columns with DEFAULT NULL doesn't work on MariaDB 10.2+

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

Commit: 3b4155a4c2f03d0b433a798024af5707b7c90679
https://github.com/phpmyadmin/phpmyadmin/commit/3b4155a4c2f03d0b433a798024af5707b7c90679
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-11-09 (Sat, 11 November 2019) +01:00

Changed paths: 
M libraries/classes/Relation.php

Log Message:
-----------
Unblock UI when column_info is detected as working but does not

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

Commit: 1fb2d7fde3f489805b058969c1bf8d05726455ba
https://github.com/phpmyadmin/phpmyadmin/commit/1fb2d7fde3f489805b058969c1bf8d05726455ba
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-11-09 (Sat, 11 November 2019) +01:00

Changed paths: 
M ChangeLog

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

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

Commit: efb40848ccd7d1500ccb364e8bc1d65ca4e1766b
https://github.com/phpmyadmin/phpmyadmin/commit/efb40848ccd7d1500ccb364e8bc1d65ca4e1766b
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-11-10 (Sun, 11 November 2019) +01:00

Changed paths: 
M po/fr.po

Log Message:
-----------
Translated using Weblate (French)

Currently translated at 100.0% (3304 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/fr/
Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: 1a07f9bc250cf51a6878078ec465ee20cf83b661
https://github.com/phpmyadmin/phpmyadmin/commit/1a07f9bc250cf51a6878078ec465ee20cf83b661
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-11-10 (Sun, 11 November 2019) +01:00

Changed paths: 
M po/fr.po

Log Message:
-----------
Translated using Weblate (French)

Currently translated at 100.0% (3329 of 3329 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/fr/
Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: b39d22b35e28c575dac82f0931d2d3fe47756bc1
https://github.com/phpmyadmin/phpmyadmin/commit/b39d22b35e28c575dac82f0931d2d3fe47756bc1
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-11-10 (Sun, 11 November 2019) +01:00

Changed paths: 
M tbl_export.php

Log Message:
-----------
Merge #15553 and #15554 - fix export, do not remove aliases or cross join

Fixes: #12241
Fixes: #15316
Fixes: #14691
Fixes: #13187
Fixes: #14612
Fixes: #13222
Closes: #13296

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

Commit: 17120e12a4da89ad01566984c0c472432556146b
https://github.com/phpmyadmin/phpmyadmin/commit/17120e12a4da89ad01566984c0c472432556146b
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-11-10 (Sun, 11 November 2019) +01:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add ChangeLog entry for #12241 and #15316

Ref: #14691
Ref: #13187
Ref: #14612
Ref: #13222

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

Commit: fa2f887703d3971395286e4382c4abf90c983799
https://github.com/phpmyadmin/phpmyadmin/commit/fa2f887703d3971395286e4382c4abf90c983799
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-11-10 (Sun, 11 November 2019) +01:00

Changed paths: 
M doc/config.rst
M doc/two_factor.rst

Log Message:
-----------
Fix redirects and broken links on .rst docs

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

Commit: df0543694c766c5946ebb96dd70f5a12b2cf1033
https://github.com/phpmyadmin/phpmyadmin/commit/df0543694c766c5946ebb96dd70f5a12b2cf1033
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-11-10 (Sun, 11 November 2019) +01:00

Changed paths: 
M ChangeLog
M doc/config.rst
M doc/two_factor.rst
M libraries/classes/Controllers/Table/StructureController.php
M libraries/classes/CreateAddField.php
M libraries/classes/Relation.php
M tbl_export.php

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

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

Commit: a11f0f22c87ee46442bbc222bcafe1e20d15aa4c
https://github.com/phpmyadmin/phpmyadmin/commit/a11f0f22c87ee46442bbc222bcafe1e20d15aa4c
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-11-10 (Sun, 11 November 2019) +01:00

Changed paths: 
M libraries/classes/Controllers/Table/TableStructureController.php

Log Message:
-----------
Fix a minor error found while reviewing diffs

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

Commit: bf8939add6cf0bda7fb317e3ffea8ca2d4261270
https://github.com/phpmyadmin/phpmyadmin/commit/bf8939add6cf0bda7fb317e3ffea8ca2d4261270
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-11-10 (Sun, 11 November 2019) +01:00

Changed paths: 
M libraries/classes/Controllers/Table/StructureController.php

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

Fixes the merge mitake done in df0543694c766c5946ebb96dd70f5a12b2cf1033
Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: acba81e09141ab9b2f3e8c54c7e981e8d7dae11a
https://github.com/phpmyadmin/phpmyadmin/commit/acba81e09141ab9b2f3e8c54c7e981e8d7dae11a
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-11-10 (Sun, 11 November 2019) +01:00

Changed paths: 
M ChangeLog
M doc/config.rst
M doc/two_factor.rst
M libraries/classes/Controllers/Table/StructureController.php
M libraries/classes/CreateAddField.php
M libraries/classes/Relation.php
M libraries/entry_points/table/export.php

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

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

Commit: a845d2fbe51185cd3488249cab7e383f004f2402
https://github.com/phpmyadmin/phpmyadmin/commit/a845d2fbe51185cd3488249cab7e383f004f2402
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-11-10 (Sun, 11 November 2019) +01:00

Changed paths: 
M libraries/classes/Util.php

Log Message:
-----------
Fix phpcs issue introduced by PR #15556

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

Commit: 68dbbedb79ef2613e0b9d337147cdde37ef39024
https://github.com/phpmyadmin/phpmyadmin/commit/68dbbedb79ef2613e0b9d337147cdde37ef39024
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-11-10 (Sun, 11 November 2019) +01:00

Changed paths: 

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

[ci skip]
Signed-off-by: William Desportes <williamdes at wdes.fr>