Skip to content

Rebase master into dev#145

Closed
avicarie wants to merge 29 commits into
developmentfrom
test_rebase_2
Closed

Rebase master into dev#145
avicarie wants to merge 29 commits into
developmentfrom
test_rebase_2

Conversation

@avicarie

Copy link
Copy Markdown
Contributor

No description provided.

e-halinen and others added 29 commits June 12, 2025 12:47
* Revert "Fix login url to prevent redirect"

This reverts commit 7127c16.

* Show prompt when template isn't selected instead of generating (#109)

* AB#32667: Add smaller TerminalPoster variant (#110)

* AB#32085: Add UI for testing line timetable generation (#111)

* Ab#32085: Prevent LineTimetable generation without dates (#112)

* AB#32085: Add UI for testing line timetable generation

* AB#32085: Disable linetimetable generation without dates

* AB#32085: Improve search UX, generate multiple line timetables at once (#113)

* AB#32085: Improve search UX, add capability to generate multiple line timetables at once

* Sort search results by lineId

* Shorten train IDs so they display correctly

* AB#32085: Print LineTimetable as A5 (#114)

* AB#46862: Tweak placeholder texts for route filtering (#115)

* Add local env

* AB#48698: Add option for printing out the cover page for timetables (#118)

* AB#48698: Add option for printing out the cover page for timetables

* Add per-build cover page

* Update button disabling logic

* AB#53258: Fix map-publisher showing up in google search results (#119)

* AB#55632: Kilvitysohje UI first version (#121)

* AB#55632: First draft of kilvitysohje UI

* AB#55632: Add support for multiple file types

* AB#55632: Show stop mode filter

* AB#55632: Add line mode colors to multi-select labels

* Fix bug with opening empty build id

* Change date range picker title for StopRoutePlate

* AB#57920: Add line query mode for StopRoutePlate component (#123)

* AB#57920: Add line query mode for StopRoutePlate component

* Add styling to StopRoutePlate line query option

* Add error checking and clearing selected lines after generating starts

* AB#56573: Add version numbering and PR check against prod version (#124)

* AB#56573: Add version numbering and PR check against prod version

* AB#56568: Change license to AGPL-3.0-only (#125)

* AB#57970: Switch to configurable ID provider, change prod ID provider (#122)

* AB#57970: Switch to configurable ID provider, change prod ID provider and client ID

* v1.1.0

---------

Co-authored-by: Juho Hänninen <juho.hanninen@cgi.com>
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](SamVerschueren/decode-uri-component@v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
#113)

* AB#32085: Improve search UX, add capability to generate multiple line timetables at once

* Sort search results by lineId

* Shorten train IDs so they display correctly
…118)

* AB#48698: Add option for printing out the cover page for timetables

* Add per-build cover page

* Update button disabling logic
* AB#55632: First draft of kilvitysohje UI

* AB#55632: Add support for multiple file types

* AB#55632: Show stop mode filter

* AB#55632: Add line mode colors to multi-select labels

* Fix bug with opening empty build id

* Change date range picker title for StopRoutePlate
* AB#56573: Add version numbering and PR check against prod version
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](npm/ini@v1.3.5...v1.3.8)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](indutny/elliptic@v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [dot-prop](https://github.com/sindresorhus/dot-prop) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/sindresorhus/dot-prop/releases)
- [Commits](sindresorhus/dot-prop@v4.2.0...v4.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.7.6 to 4.7.7.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](handlebars-lang/handlebars.js@v4.7.6...v4.7.7)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.15...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](npm/hosted-git-info@v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](mafintosh/dns-packet@v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.21 to 0.7.31.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](faisalman/ua-parser-js@0.7.21...0.7.31)

---
updated-dependencies:
- dependency-name: ua-parser-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.12.1 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.12.1...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.7 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](unshiftio/url-parse@1.4.7...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [urijs](https://github.com/medialize/URI.js) from 1.19.2 to 1.19.11.
- [Release notes](https://github.com/medialize/URI.js/releases)
- [Changelog](https://github.com/medialize/URI.js/blob/gh-pages/CHANGELOG.md)
- [Commits](medialize/URI.js@v1.19.2...v1.19.11)

---
updated-dependencies:
- dependency-name: urijs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [cross-fetch](https://github.com/lquixada/cross-fetch) from 3.0.6 to 3.1.5.
- [Release notes](https://github.com/lquixada/cross-fetch/releases)
- [Commits](lquixada/cross-fetch@v3.0.6...v3.1.5)

---
updated-dependencies:
- dependency-name: cross-fetch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [moment](https://github.com/moment/moment) from 2.27.0 to 2.29.4.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](moment/moment@2.27.0...2.29.4)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Production release (#126)

* Revert "Fix login url to prevent redirect"

This reverts commit 7127c16.

* Show prompt when template isn't selected instead of generating (#109)

* AB#32667: Add smaller TerminalPoster variant (#110)

* AB#32085: Add UI for testing line timetable generation (#111)

* Ab#32085: Prevent LineTimetable generation without dates (#112)

* AB#32085: Add UI for testing line timetable generation

* AB#32085: Disable linetimetable generation without dates

* AB#32085: Improve search UX, generate multiple line timetables at once (#113)

* AB#32085: Improve search UX, add capability to generate multiple line timetables at once

* Sort search results by lineId

* Shorten train IDs so they display correctly

* AB#32085: Print LineTimetable as A5 (#114)

* AB#46862: Tweak placeholder texts for route filtering (#115)

* Add local env

* AB#48698: Add option for printing out the cover page for timetables (#118)

* AB#48698: Add option for printing out the cover page for timetables

* Add per-build cover page

* Update button disabling logic

* AB#53258: Fix map-publisher showing up in google search results (#119)

* AB#55632: Kilvitysohje UI first version (#121)

* AB#55632: First draft of kilvitysohje UI

* AB#55632: Add support for multiple file types

* AB#55632: Show stop mode filter

* AB#55632: Add line mode colors to multi-select labels

* Fix bug with opening empty build id

* Change date range picker title for StopRoutePlate

* AB#57920: Add line query mode for StopRoutePlate component (#123)

* AB#57920: Add line query mode for StopRoutePlate component

* Add styling to StopRoutePlate line query option

* Add error checking and clearing selected lines after generating starts

* AB#56573: Add version numbering and PR check against prod version (#124)

* AB#56573: Add version numbering and PR check against prod version

* AB#56568: Change license to AGPL-3.0-only (#125)

* AB#57970: Switch to configurable ID provider, change prod ID provider (#122)

* AB#57970: Switch to configurable ID provider, change prod ID provider and client ID

* v1.1.0

---------

Co-authored-by: Juho Hänninen <juho.hanninen@cgi.com>

* Bump decode-uri-component from 0.2.0 to 0.2.2 (#105)

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](SamVerschueren/decode-uri-component@v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Revert "Bump decode-uri-component from 0.2.0 to 0.2.2 (#105)" (#127)

This reverts commit 43d2c9a.

* Bump express from 4.17.1 to 4.18.2

Bumps [express](https://github.com/expressjs/express) from 4.17.1 to 4.18.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](expressjs/express@4.17.1...4.18.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: e-halinen <54105602+e-halinen@users.noreply.github.com>
Co-authored-by: Juho Hänninen <juho.hanninen@cgi.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Production release (#126)

* Revert "Fix login url to prevent redirect"

This reverts commit 7127c16.

* Show prompt when template isn't selected instead of generating (#109)

* AB#32667: Add smaller TerminalPoster variant (#110)

* AB#32085: Add UI for testing line timetable generation (#111)

* Ab#32085: Prevent LineTimetable generation without dates (#112)

* AB#32085: Add UI for testing line timetable generation

* AB#32085: Disable linetimetable generation without dates

* AB#32085: Improve search UX, generate multiple line timetables at once (#113)

* AB#32085: Improve search UX, add capability to generate multiple line timetables at once

* Sort search results by lineId

* Shorten train IDs so they display correctly

* AB#32085: Print LineTimetable as A5 (#114)

* AB#46862: Tweak placeholder texts for route filtering (#115)

* Add local env

* AB#48698: Add option for printing out the cover page for timetables (#118)

* AB#48698: Add option for printing out the cover page for timetables

* Add per-build cover page

* Update button disabling logic

* AB#53258: Fix map-publisher showing up in google search results (#119)

* AB#55632: Kilvitysohje UI first version (#121)

* AB#55632: First draft of kilvitysohje UI

* AB#55632: Add support for multiple file types

* AB#55632: Show stop mode filter

* AB#55632: Add line mode colors to multi-select labels

* Fix bug with opening empty build id

* Change date range picker title for StopRoutePlate

* AB#57920: Add line query mode for StopRoutePlate component (#123)

* AB#57920: Add line query mode for StopRoutePlate component

* Add styling to StopRoutePlate line query option

* Add error checking and clearing selected lines after generating starts

* AB#56573: Add version numbering and PR check against prod version (#124)

* AB#56573: Add version numbering and PR check against prod version

* AB#56568: Change license to AGPL-3.0-only (#125)

* AB#57970: Switch to configurable ID provider, change prod ID provider (#122)

* AB#57970: Switch to configurable ID provider, change prod ID provider and client ID

* v1.1.0

---------

Co-authored-by: Juho Hänninen <juho.hanninen@cgi.com>

* Bump decode-uri-component from 0.2.0 to 0.2.2 (#105)

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](SamVerschueren/decode-uri-component@v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Revert "Bump decode-uri-component from 0.2.0 to 0.2.2 (#105)" (#127)

This reverts commit 43d2c9a.

* Bump ua-parser-js from 0.7.21 to 0.7.33

Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.21 to 0.7.33.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Changelog](https://github.com/faisalman/ua-parser-js/blob/master/changelog.md)
- [Commits](faisalman/ua-parser-js@0.7.21...0.7.33)

---
updated-dependencies:
- dependency-name: ua-parser-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: e-halinen <54105602+e-halinen@users.noreply.github.com>
Co-authored-by: Juho Hänninen <juho.hanninen@cgi.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@avicarie avicarie changed the title Test rebase 2 Rebase master into dev Sep 17, 2025
@avicarie avicarie changed the base branch from master to development September 17, 2025 08:42
@avicarie avicarie force-pushed the test_rebase_2 branch 2 times, most recently from f95c959 to a96cfb8 Compare September 17, 2025 08:53
@avicarie avicarie closed this Sep 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants