Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2f38ed2d60176cd0e0853d42a8b748501a0c9edf https://github.com/phpmyadmin/phpmyadmin/commit/2f38ed2d60176cd0e0853d42a8b7... Author: Andreas Hocevar <andreas.hocevar@gmail.com> Date: 2021-06-13 (Sun, 06 June 2021) +02:00 Changed paths: A js/config/ol/webpack.config.js A js/src/ol.mjs A js/vendor/openlayers/OpenLayers.js.map M js/vendor/openlayers/OpenLayers.js M js/vendor/openlayers/theme/ol.css M scripts/sync-js-vendor-files.sh D js/vendor/openlayers/ol.js.map D js/vendor/openlayers/theme/ol.css.map Log Message: ----------- Create custom OpenLayers build when syncing js vendor files Use .mjs extension because ol.js uses ES imports Co-authored-by: William Desportes <williamdes@wdes.fr> Signed-off-by: Andreas Hocevar <andreas.hocevar@gmail.com> Commit: 03ca33e7f4f95c14c49b1eef39b169418b01d12e https://github.com/phpmyadmin/phpmyadmin/commit/03ca33e7f4f95c14c49b1eef39b1... Author: William Desportes <williamdes@wdes.fr> Date: 2021-06-13 (Sun, 06 June 2021) +02:00 Changed paths: A js/config/ol/webpack.config.js A js/src/ol.mjs A js/vendor/openlayers/OpenLayers.js.map M js/vendor/openlayers/OpenLayers.js M js/vendor/openlayers/theme/ol.css M scripts/sync-js-vendor-files.sh D js/vendor/openlayers/ol.js.map D js/vendor/openlayers/theme/ol.css.map Log Message: ----------- Merge #16959 - Build OpenLayers js dependency from the sync script Pull-request: #16959 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 7edfe934bff94ec094d45b4649b6808f00686859 https://github.com/phpmyadmin/phpmyadmin/commit/7edfe934bff94ec094d45b4649b6... Author: William Desportes <williamdes@wdes.fr> Date: 2021-06-13 (Sun, 06 June 2021) +02:00 Changed paths: M ChangeLog Log Message: ----------- Add a ChangeLog entry for 03ca33e7f4 Pull-request: #16959 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: ce2f6edec60ecd392d82490f57f85afd1fce5665 https://github.com/phpmyadmin/phpmyadmin/commit/ce2f6edec60ecd392d82490f57f8... Author: William Desportes <williamdes@wdes.fr> Date: 2021-06-13 (Sun, 06 June 2021) +02:00 Changed paths: A js/config/ol/webpack.config.js A js/src/ol.mjs A js/vendor/openlayers/OpenLayers.js.map M ChangeLog M js/vendor/openlayers/OpenLayers.js M js/vendor/openlayers/theme/ol.css M scripts/sync-js-vendor-files.sh D js/vendor/openlayers/ol.js.map D js/vendor/openlayers/theme/ol.css.map Log Message: ----------- Merge branch 'QA_5_1' Signed-off-by: William Desportes <williamdes@wdes.fr>