- Git - lists.phpmyadmin.net

[phpmyadmin/docker] 0343ca: Update to phpMyAdmin release 4.9.2
by Isaac Bennetch 23 Nov '19

23 Nov '19

Branch: refs/tags/4.9.2-1 Home: https://github.com/phpmyadmin/docker Commit: 0343ca533896b49b3991f20ce8c3565eab94e378 https://github.com/phpmyadmin/docker/commit/0343ca533896b49b3991f20ce8c3565… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-23 (Sat, 11 November 2019) -05:00 Changed paths: M apache/Dockerfile M fpm-alpine/Dockerfile M fpm/Dockerfile Log Message: ----------- Update to phpMyAdmin release 4.9.2 Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] 8fbd20: Prepare for version 4.9.3-dev
by Isaac Bennetch 23 Nov '19

23 Nov '19

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8fbd20ba31dd55d73fb10bc9aad47de92cce6d84 https://github.com/phpmyadmin/phpmyadmin/commit/8fbd20ba31dd55d73fb10bc9aad… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-23 (Sat, 11 November 2019) -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.3-dev Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 2a7a8c7dbfe4849fe834fa98c7e1697d15cba2fc https://github.com/phpmyadmin/phpmyadmin/commit/2a7a8c7dbfe4849fe834fa98c7e… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-23 (Sat, 11 November 2019) -05:00 Changed paths: Log Message: ----------- Merge branch 'QA_4_9' into QA_5_0 Commit: b61d659feab5c0b730912fad8b68446d6f3edf85 https://github.com/phpmyadmin/phpmyadmin/commit/b61d659feab5c0b730912fad8b6… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-23 (Sat, 11 November 2019) -05:00 Changed paths: Log Message: ----------- Merge branch 'QA_5_0'

1 0

[phpmyadmin/phpmyadmin] 8fbd20: Prepare for version 4.9.3-dev
by Isaac Bennetch 23 Nov '19

23 Nov '19

Branch: refs/heads/QA_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8fbd20ba31dd55d73fb10bc9aad47de92cce6d84 https://github.com/phpmyadmin/phpmyadmin/commit/8fbd20ba31dd55d73fb10bc9aad… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-23 (Sat, 11 November 2019) -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.3-dev Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 2a7a8c7dbfe4849fe834fa98c7e1697d15cba2fc https://github.com/phpmyadmin/phpmyadmin/commit/2a7a8c7dbfe4849fe834fa98c7e… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-23 (Sat, 11 November 2019) -05:00 Changed paths: Log Message: ----------- Merge branch 'QA_4_9' into QA_5_0

1 0

[phpmyadmin/phpmyadmin] 8fbd20: Prepare for version 4.9.3-dev
by Isaac Bennetch 23 Nov '19

23 Nov '19

Branch: refs/heads/QA_4_9 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8fbd20ba31dd55d73fb10bc9aad47de92cce6d84 https://github.com/phpmyadmin/phpmyadmin/commit/8fbd20ba31dd55d73fb10bc9aad… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-23 (Sat, 11 November 2019) -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.3-dev Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] 4e615c: Adding composer lock for 4.9.2
by Isaac Bennetch 23 Nov '19

23 Nov '19

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4e615cc5e5165de4663bb2510ffaf97bc953e718 https://github.com/phpmyadmin/phpmyadmin/commit/4e615cc5e5165de4663bb2510ff… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-22 (Fri, 11 November 2019) -05:00 Changed paths: A composer.lock Log Message: ----------- Adding composer lock for 4.9.2 Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 2a1ab3016dfd3627c23b8f14535a03c5d8b61f3f https://github.com/phpmyadmin/phpmyadmin/commit/2a1ab3016dfd3627c23b8f14535… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-22 (Fri, 11 November 2019) -05:00 Changed paths: D composer.lock Log Message: ----------- Removing composer.lock Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 3f9ac1dc98cf445cf6079a247eefb680f96aeb10 https://github.com/phpmyadmin/phpmyadmin/commit/3f9ac1dc98cf445cf6079a247ee… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-23 (Sat, 11 November 2019) +01:00 Changed paths: M libraries/classes/Database/Designer/Common.php Log Message: ----------- Fix engine can be null Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 293d273632fbe5faa75d98d0d738cc9b9ea03189 https://github.com/phpmyadmin/phpmyadmin/commit/293d273632fbe5faa75d98d0d73… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-23 (Sat, 11 November 2019) +01:00 Changed paths: M libraries/classes/Database/Designer/Common.php Log Message: ----------- Merge branch 'QA_4_9' into QA_5_0 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 4e4670e9c2d8d4a3e3403d8b61e46c9f2c923ebf https://github.com/phpmyadmin/phpmyadmin/commit/4e4670e9c2d8d4a3e3403d8b61e… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-23 (Sat, 11 November 2019) +01:00 Changed paths: M libraries/classes/Database/Designer/Common.php Log Message: ----------- Merge branch 'QA_5_0' Signed-off-by: William Desportes <williamdes(a)wdes.fr>

1 0

[phpmyadmin/phpmyadmin] 4e615c: Adding composer lock for 4.9.2
by Isaac Bennetch 23 Nov '19

23 Nov '19

Branch: refs/heads/QA_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4e615cc5e5165de4663bb2510ffaf97bc953e718 https://github.com/phpmyadmin/phpmyadmin/commit/4e615cc5e5165de4663bb2510ff… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-22 (Fri, 11 November 2019) -05:00 Changed paths: A composer.lock Log Message: ----------- Adding composer lock for 4.9.2 Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 2a1ab3016dfd3627c23b8f14535a03c5d8b61f3f https://github.com/phpmyadmin/phpmyadmin/commit/2a1ab3016dfd3627c23b8f14535… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-22 (Fri, 11 November 2019) -05:00 Changed paths: D composer.lock Log Message: ----------- Removing composer.lock Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 3f9ac1dc98cf445cf6079a247eefb680f96aeb10 https://github.com/phpmyadmin/phpmyadmin/commit/3f9ac1dc98cf445cf6079a247ee… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-23 (Sat, 11 November 2019) +01:00 Changed paths: M libraries/classes/Database/Designer/Common.php Log Message: ----------- Fix engine can be null Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 293d273632fbe5faa75d98d0d738cc9b9ea03189 https://github.com/phpmyadmin/phpmyadmin/commit/293d273632fbe5faa75d98d0d73… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-23 (Sat, 11 November 2019) +01:00 Changed paths: M libraries/classes/Database/Designer/Common.php Log Message: ----------- Merge branch 'QA_4_9' into QA_5_0 Signed-off-by: William Desportes <williamdes(a)wdes.fr>

1 0

[phpmyadmin/phpmyadmin] 3f9ac1: Fix engine can be null
by William Desportes 23 Nov '19

23 Nov '19

Branch: refs/heads/QA_4_9 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3f9ac1dc98cf445cf6079a247eefb680f96aeb10 https://github.com/phpmyadmin/phpmyadmin/commit/3f9ac1dc98cf445cf6079a247ee… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-23 (Sat, 11 November 2019) +01:00 Changed paths: M libraries/classes/Database/Designer/Common.php Log Message: ----------- Fix engine can be null Signed-off-by: William Desportes <williamdes(a)wdes.fr>

1 0

[phpmyadmin/phpmyadmin] 4bde7f: Fix a merge issue reported by Scrutinizer
by William Desportes 22 Nov '19

22 Nov '19

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4bde7fb6afc6972778d5e898c715445d9a6617d0 https://github.com/phpmyadmin/phpmyadmin/commit/4bde7fb6afc6972778d5e898c71… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: M libraries/classes/Display/GitRevision.php Log Message: ----------- Fix a merge issue reported by Scrutinizer - isRemoteBranch was undefined Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 718db2af8357797d2029a1d0c9e0447dc1095553 https://github.com/phpmyadmin/phpmyadmin/commit/718db2af8357797d2029a1d0c9e… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: M libraries/classes/Display/GitRevision.php Log Message: ----------- Merge branch 'QA_5_0' Signed-off-by: William Desportes <williamdes(a)wdes.fr>

1 0

[phpmyadmin/phpmyadmin] 4bde7f: Fix a merge issue reported by Scrutinizer
by William Desportes 22 Nov '19

22 Nov '19

Branch: refs/heads/QA_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4bde7fb6afc6972778d5e898c715445d9a6617d0 https://github.com/phpmyadmin/phpmyadmin/commit/4bde7fb6afc6972778d5e898c71… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: M libraries/classes/Display/GitRevision.php Log Message: ----------- Fix a merge issue reported by Scrutinizer - isRemoteBranch was undefined Signed-off-by: William Desportes <williamdes(a)wdes.fr>

1 0

[phpmyadmin/phpmyadmin] 1119de: Escape Git information on the index page
by Maurício Meneghini Fauth 22 Nov '19

22 Nov '19

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1119de642b136d20e810bb20f545069a01dd7cc9 https://github.com/phpmyadmin/phpmyadmin/commit/1119de642b136d20e810bb20f54… Author: Maurício Meneghini Fauth <mauricio(a)fauth.dev> Date: 2019-10-18 (Fri, 10 October 2019) -03:00 Changed paths: M libraries/classes/Display/GitRevision.php M libraries/classes/Footer.php Log Message: ----------- Escape Git information on the index page Signed-off-by: Maurício Meneghini Fauth <mauricio(a)fauth.dev> Commit: 1de317993fc5ab7712a2eb90ac4c06d0624c740a https://github.com/phpmyadmin/phpmyadmin/commit/1de317993fc5ab7712a2eb90ac4… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-20 (Wed, 11 November 2019) +01:00 Changed paths: M js/designer/move.js Log Message: ----------- Fix adding a table from list, do not crash the designer if impossible to add Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 06be1cc209111bd93c5b0e59439b922a3c34ad48 https://github.com/phpmyadmin/phpmyadmin/commit/06be1cc209111bd93c5b0e59439… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-20 (Wed, 11 November 2019) +01:00 Changed paths: M js/designer/move.js Log Message: ----------- Fix comment mistakes Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 39a98a7fdf31414dd0842b5968b1b658cf2ab862 https://github.com/phpmyadmin/phpmyadmin/commit/39a98a7fdf31414dd0842b5968b… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-20 (Wed, 11 November 2019) +01:00 Changed paths: M js/designer/move.js M templates/database/designer/database_tables.twig Log Message: ----------- Improve storing columns on designer and add a translation Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 4b6f04c14258f4940826e9154744387721a244f4 https://github.com/phpmyadmin/phpmyadmin/commit/4b6f04c14258f4940826e915474… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-20 (Wed, 11 November 2019) +01:00 Changed paths: M js/designer/move.js M templates/database/designer/database_tables.twig Log Message: ----------- Improve select all checkbox process on designer and fix a bug The bug is: - select a column name checkbox - select all columns checkbox - deselect all columns checkbox - build query - the first checked column is added and can not be removed now (this is the bug) Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 2adf0ba1ac47772f69ff3587951de989668e6d52 https://github.com/phpmyadmin/phpmyadmin/commit/2adf0ba1ac47772f69ff3587951… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-20 (Wed, 11 November 2019) +01:00 Changed paths: M db_designer.php M js/designer/history.js M js/designer/move.js M js/messages.php M templates/database/designer/database_tables.twig M templates/database/designer/options_panel.twig Log Message: ----------- Remove some hacks and strange things from designer Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 988ae066a8ca8fea45682b92e0e5f9f600df8c11 https://github.com/phpmyadmin/phpmyadmin/commit/988ae066a8ca8fea45682b92e0e… Author: Saulo Soares de Toledo <saulotoledo(a)gmail.com> Date: 2019-11-20 (Wed, 11 November 2019) +01:00 Changed paths: M js/functions.js Log Message: ----------- Fix table select range with Shift key Signed-off-by: Saulo Soares de Toledo <saulotoledo(a)gmail.com> Commit: 81af47212338418473dce1ef6dfc7388d8493f4f https://github.com/phpmyadmin/phpmyadmin/commit/81af47212338418473dce1ef6df… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-21 (Thu, 11 November 2019) -05:00 Changed paths: M ChangeLog M db_designer.php M js/designer/history.js M js/designer/move.js M js/messages.php M libraries/classes/Database/Designer.php M libraries/classes/Database/Designer/Common.php M libraries/classes/Database/Designer/DesignerTable.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fil.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/ig.po M po/it.po M po/ja.po M po/ka.po M po/kab.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ku.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/my.po M po/nb.po M po/ne.po M po/nl.po M po/nn.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M templates/database/designer/database_tables.twig M templates/database/designer/options_panel.twig M themes/pmahomme/css/designer.css.php Log Message: ----------- Merge pull request #289 from phpmyadmin/QA_4_9+designer-changes Designer changes and fixes for 4.9 Commit: 16959bfa8c2356178c9c8ff311cf20a860a67554 https://github.com/phpmyadmin/phpmyadmin/commit/16959bfa8c2356178c9c8ff311c… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-21 (Thu, 11 November 2019) -05:00 Changed paths: M libraries/classes/Display/GitRevision.php M libraries/classes/Footer.php Log Message: ----------- Merge pull request #285 from phpmyadmin/security/284 Escape Git information on the index page Commit: ff541af95d7155d8dd326f331b5e248fea8e7111 https://github.com/phpmyadmin/phpmyadmin/commit/ff541af95d7155d8dd326f331b5… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-21 (Thu, 11 November 2019) +01:00 Changed paths: M js/designer/move.js M templates/database/designer/database_tables.twig Log Message: ----------- Security patch for Designer and Designer visual mode Closes: phpmyadmin-security#286 Ref: CVE-2019-18622 Ref: PMASA-2019-5 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 19cdf4f165d8d8137e88bc5c340475a1e6f4beec https://github.com/phpmyadmin/phpmyadmin/commit/19cdf4f165d8d8137e88bc5c340… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2019-11-21 (Thu, 11 November 2019) +01:00 Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3305 of 3305 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/tr/ Signed-off-by: Burak Yavuz <hitowerdigit(a)hotmail.com> Commit: f1c8a4163c17e66f4f61b64ec5437223f0e8ab36 https://github.com/phpmyadmin/phpmyadmin/commit/f1c8a4163c17e66f4f61b64ec54… Author: Kongfa Warorot <gongpha(a)hotmail.com> Date: 2019-11-21 (Thu, 11 November 2019) +01:00 Changed paths: M po/th.po Log Message: ----------- Translated using Weblate (Thai) Currently translated at 40.5% (1337 of 3305 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/th/ Signed-off-by: Kongfa Warorot <gongpha(a)hotmail.com> Commit: 3052f725e14d42bc2a278db1d155081fcb4d8b24 https://github.com/phpmyadmin/phpmyadmin/commit/3052f725e14d42bc2a278db1d15… Author: Olivier Humbert <trebmuh(a)tuxfamily.org> Date: 2019-11-21 (Thu, 11 November 2019) +01:00 Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 100.0% (3305 of 3305 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/fr/ Signed-off-by: Olivier Humbert <trebmuh(a)tuxfamily.org> Commit: 30411bcc5445e10f6229379a57b58c2879d282d4 https://github.com/phpmyadmin/phpmyadmin/commit/30411bcc5445e10f6229379a57b… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2019-11-21 (Thu, 11 November 2019) +01:00 Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3330 of 3330 strings) [CI skip] Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/tr/ Signed-off-by: Burak Yavuz <hitowerdigit(a)hotmail.com> Commit: 992a79d318b4f80daa148e62d7a55f7b0a816dd1 https://github.com/phpmyadmin/phpmyadmin/commit/992a79d318b4f80daa148e62d7a… Author: Kongfa Warorot <gongpha(a)hotmail.com> Date: 2019-11-21 (Thu, 11 November 2019) +01:00 Changed paths: M po/th.po Log Message: ----------- Translated using Weblate (Thai) Currently translated at 32.6% (1085 of 3330 strings) [CI skip] Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/th/ Signed-off-by: Kongfa Warorot <gongpha(a)hotmail.com> Commit: fbdd44cc7965691941c9129e28eeb5f448fab410 https://github.com/phpmyadmin/phpmyadmin/commit/fbdd44cc7965691941c9129e28e… Author: Olivier Humbert <trebmuh(a)tuxfamily.org> Date: 2019-11-21 (Thu, 11 November 2019) +01:00 Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 100.0% (3330 of 3330 strings) [CI skip] Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/fr/ Signed-off-by: Olivier Humbert <trebmuh(a)tuxfamily.org> Commit: 51acbf53564d9b52e78509a5688ec2b68976b5f7 https://github.com/phpmyadmin/phpmyadmin/commit/51acbf53564d9b52e78509a5688… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: M js/designer/move.js M templates/database/designer/database_tables.twig Log Message: ----------- Merge designer security fix Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 70d5ba995c47ac14b5a8fd3866c690f5450f057f https://github.com/phpmyadmin/phpmyadmin/commit/70d5ba995c47ac14b5a8fd3866c… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: M js/functions.js Log Message: ----------- Merge #15579 - Fix checkbox selection Pull-request: #15579 Fixes: #15578 Fixes: #15327 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 348904fc1215fecd31bd8a33546575dc109b68da https://github.com/phpmyadmin/phpmyadmin/commit/348904fc1215fecd31bd8a33546… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog entry for #15327 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 28bdc02c3c5b27cfe249f7ac328b3a335c8fe29f https://github.com/phpmyadmin/phpmyadmin/commit/28bdc02c3c5b27cfe249f7ac328… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: M ChangeLog M js/designer/history.js M js/designer/move.js M js/functions.js M js/messages.php M libraries/classes/Display/GitRevision.php M libraries/classes/Footer.php M templates/database/designer/database_tables.twig M templates/database/designer/main.twig Log Message: ----------- Merge branch 'QA_4_9-security' into QA_5_0-security Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 718ceadeb6ea4efccd0298e6f5238e0f3bb2ba5a https://github.com/phpmyadmin/phpmyadmin/commit/718ceadeb6ea4efccd0298e6f52… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: M ChangeLog M js/designer/history.js M js/designer/move.js M js/functions.js M js/messages.php M libraries/classes/Display/GitRevision.php M libraries/classes/Footer.php M templates/database/designer/database_tables.twig M templates/database/designer/main.twig Log Message: ----------- Merge branch 'QA_5_0-security' into master-security Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: ad3c3ffd7481e5820f92fa1957005fd113bb5cc8 https://github.com/phpmyadmin/phpmyadmin/commit/ad3c3ffd7481e5820f92fa19570… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fil.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/ig.po M po/it.po M po/ja.po M po/ka.po M po/kab.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ku.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/my.po M po/nb.po M po/ne.po M po/nl.po M po/nn.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files [ci skip] Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: c7075fb450ebf73d9045b2a4de61e57c59a33f30 https://github.com/phpmyadmin/phpmyadmin/commit/c7075fb450ebf73d9045b2a4de6… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: Log Message: ----------- Merge branch 'QA_4_9-security' into QA_5_0-security Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 106eea596881a2ce6b42e285bcbce7db6155bda7 https://github.com/phpmyadmin/phpmyadmin/commit/106eea596881a2ce6b42e285bcb… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fil.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/ig.po M po/it.po M po/ja.po M po/ka.po M po/kab.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ku.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/my.po M po/nb.po M po/ne.po M po/nl.po M po/nn.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files [ci skip] Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: f1dc9ffaced1fffaf523b1b77fa4ac071d2a6c47 https://github.com/phpmyadmin/phpmyadmin/commit/f1dc9ffaced1fffaf523b1b77fa… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: Log Message: ----------- Merge branch 'QA_5_0-security' into master-security Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: a84b1e5daf493bafb81252d8a6d0576bd4241927 https://github.com/phpmyadmin/phpmyadmin/commit/a84b1e5daf493bafb81252d8a6d… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fil.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/ig.po M po/it.po M po/ja.po M po/ka.po M po/kab.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ku.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/my.po M po/nb.po M po/ne.po M po/nl.po M po/nn.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files [ci skip] Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: ef9aa68bb554cf32fe849abd56fc8b84afd7ef68 https://github.com/phpmyadmin/phpmyadmin/commit/ef9aa68bb554cf32fe849abd56f… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: M po/fr.po M po/th.po M po/tr.po Log Message: ----------- Merge branch 'QA_4_9' into QA_4_9-security Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 66192e31f54a5047f7a4936fd279d7d84bbae73f https://github.com/phpmyadmin/phpmyadmin/commit/66192e31f54a5047f7a4936fd27… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: Log Message: ----------- Merge branch 'QA_4_9-security' into QA_5_0-security Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: b6e78406f3c7360c50c18550fe879818fb8ff854 https://github.com/phpmyadmin/phpmyadmin/commit/b6e78406f3c7360c50c18550fe8… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-21 (Thu, 11 November 2019) -05:00 Changed paths: M ChangeLog Log Message: ----------- Changelog for 4.9.2 Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: c1e1816af73e4d818242bf72ab31a9fc711f0747 https://github.com/phpmyadmin/phpmyadmin/commit/c1e1816af73e4d818242bf72ab3… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-21 (Thu, 11 November 2019) -05:00 Changed paths: M ChangeLog Log Message: ----------- Fix merge conflicts in ChangeLog Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 00f72f11719665057f193f9621da1e9fdb7b6467 https://github.com/phpmyadmin/phpmyadmin/commit/00f72f11719665057f193f9621d… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-21 (Thu, 11 November 2019) -05:00 Changed paths: M README M doc/conf.py M libraries/classes/Config.php M package.json Log Message: ----------- Prepare for version 4.9.2 Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 478a75dce5f74272d3e53dfcf6f6a5c595c24904 https://github.com/phpmyadmin/phpmyadmin/commit/478a75dce5f74272d3e53dfcf6f… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-21 (Thu, 11 November 2019) -05:00 Changed paths: Log Message: ----------- Merge branch 'QA_4_9' into QA_5_0 Commit: 3cf66e239ae629825b8b5f5d729643aec5963b58 https://github.com/phpmyadmin/phpmyadmin/commit/3cf66e239ae629825b8b5f5d729… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-21 (Thu, 11 November 2019) -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.0-rc1 Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: aaf114f8e306318b7e1d0a3e20a8ff69b11ea3fa https://github.com/phpmyadmin/phpmyadmin/commit/aaf114f8e306318b7e1d0a3e20a… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-22 (Fri, 11 November 2019) -05:00 Changed paths: A composer.lock Log Message: ----------- Adding composer lock for 5.0.0-rc1 Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: f5b4fe69da4cd372688527d982dd6ca833b5f373 https://github.com/phpmyadmin/phpmyadmin/commit/f5b4fe69da4cd372688527d982d… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2019-11-22 (Fri, 11 November 2019) -05:00 Changed paths: D composer.lock Log Message: ----------- Removing composer.lock Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: bfe1afb542c1c9b5c4f7773a2ffe245140db1a14 https://github.com/phpmyadmin/phpmyadmin/commit/bfe1afb542c1c9b5c4f7773a2ff… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-22 (Fri, 11 November 2019) +01:00 Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_5_0' Signed-off-by: William Desportes <williamdes(a)wdes.fr>

1 0