Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstream merge 2025-01-03 #242

Merged
merged 139 commits into from
Jan 3, 2025
Merged

Upstream merge 2025-01-03 #242

merged 139 commits into from
Jan 3, 2025

Conversation

leonardehrenfried
Copy link

@leonardehrenfried leonardehrenfried commented Jan 3, 2025 •
edited
Loading

Happy new year!

This merge contains the following items for Arcadis:

vesameskanen and others added 30 commits October 2, 2023 17:03
@vesameskanen
Draft upcoming cancelled trips query
4b052d5
@vesameskanen
Remove duplicate imports
2e6529e
@vesameskanen
Node resolver for DatedTrip
627d251
@vesameskanen
Hook in DatedTrip data fetcher
6c26434
@vesameskanen
Feed filtering parameter for cancelled trips query
fb71d74
@vesameskanen
More efficient iteration over all trips
184e7e2
@vesameskanen
Sort cancelled trips by ascending time
2787b7e
@vesameskanen
Move filtering by feed into transit service
58f0387 
It is much more efficient to filter trips in early stage
@vesameskanen
Merge remote-tracking branch 'otp/dev-2.x' into gtfsgraphql-cancelled…
3388c15 
…-trips
@vesameskanen
Merge remote-tracking branch 'otp/dev-2.x' into gtfsgraphql-cancelled…
45aacde 
…-trips
@renovate
Update typescript-eslint monorepo to v8
d65d5dd
@testower
Upgrade to eslint v9
46a40ef
@testower
Migrate to new config
f162ce8
@optionsome
Merge remote-tracking branch 'upstream/dev-2.x' into gtfsgraphql-canc…
a1fe6e3 
…elled-trips
@optionsome
Use LocalDate for date and include trip's fields instead of trip
20df02b
@optionsome
Improve documentation and mark cancelledTripTimes as deprecated
2a9df2a
@optionsome
Add start and end to schema
b142bdf
@optionsome
Create DatedStopTime type and use it in DatedTrip
8e12d3a
@optionsome
cancelled -> canceled
53ff5d5
@optionsome
Add graphql test
0469361
@optionsome
Rename method
c0648b7
@optionsome
Add small tests
6437bd7
@optionsome
Realtime -> RealTime
6e143d9
@optionsome
Add more tests
1de24b2
@optionsome
Refactor canceled trips fetching to be more efficient
7251391
@optionsome
Update and fix tests
bedee96
@optionsome
Create an union for dated stoptimes
c0768e0
@optionsome
Use TripOnServiceDate and redesign schema
66100b9
@optionsome
Merge remote-tracking branch 'upstream/dev-2.x' into gtfsgraphql-canc…
284c483 
…elled-trips
@optionsome
Remove stuff from new stoptime type
079485e
OTP Changelog Bot and others added 25 commits December 17, 2024 09:39
Add changelog entry for opentripplanner#6302 [ci skip]
e130997
@leonardehrenfried
Use cent sign for generalized cost
edcba5a
@leonardehrenfried
Merge pull request opentripplanner#6336 from leonardehrenfried/debug-…
b04dc99 
…ui-cost

Show generalized cost in debug UI
Upgrade debug client to version 2024/12/2024-12-17T11:50
5f9b448
@renovate
fix(deps): update debug ui dependencies (non-major)
313ac9c
@leonardehrenfried
Fix formatting
e1e5fed
@leonardehrenfried
Merge pull request opentripplanner#6341 from opentripplanner/renovate…
554e3bd 
…/debug-ui-dependencies-(non-major)

fix(deps): update debug ui dependencies (non-major)
Upgrade debug client to version 2024/12/2024-12-18T09:00
2d012a3
@miklcct
fix test failure when building OTP in a path with special characters.
2eedb12 
https://stackoverflow.com/a/13470643

fixes opentripplanner#6337
@leonardehrenfried
Merge pull request opentripplanner#6311 from ibi-group/flex-linking
b30e045 
Make flex linking work together with boarding locations
Add changelog entry for opentripplanner#6311 [ci skip]
ed2d7f5
@miklcct
remove unused import
b9f4135
@tkalvas
Merge pull request opentripplanner#6344 from Jnction/fix/build_path
4198bb6 
Fix test failure when building OTP in a path with special characters
@leonardehrenfried
Merge pull request opentripplanner#6303 from ibi-group/corridor-name
e890466 
Add fallback name for corridors
Add changelog entry for opentripplanner#6303 [ci skip]
6e8ccff
@renovate
chore(deps): update dependency mkdocs-material to v9.5.49 (opentrippl…
ac8058b 
…anner#6352)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@testower
Merge branch 'dev-2.x' into eslint-9
9d97679
@testower
Updates for eslint v9
2d4ff0c
@testower
Update package-lock
57898e6
@leonardehrenfried
Merge pull request opentripplanner#6356 from entur/eslint-9
c5ba6e8 
Eslint 9 upgrades
Upgrade debug client to version 2025/01/2025-01-02T15:56
e1b3064
@leonardehrenfried
Merge remote-tracking branch 'upstream/dev-2.x' into upstream-merge-2…
2f2ab3e 
…025-01-03
@leonardehrenfried
Change location of shaded jar
a27b052
@leonardehrenfried
Change jar location
07f4824
@leonardehrenfried
Disable Denver smoke tests
256127e
miles-grant-ibigroup
miles-grant-ibigroup approved these changes Jan 3, 2025
View reviewed changes
Copy link

@miles-grant-ibigroup miles-grant-ibigroup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lovely! I'm a little confused as to why things still work even though the default jar location changed but I'm glad it is!

@miles-grant-ibigroup miles-grant-ibigroup merged commit 98dd162 into ibi-dev-2.x Jan 3, 2025
16 checks passed
@miles-grant-ibigroup miles-grant-ibigroup deleted the upstream-merge-2025-01-03 branch January 3, 2025 14:43
@leonardehrenfried
Copy link
Author

I changed the scripts in these commits:

a27b052
07f4824

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miles-grant-ibigroup miles-grant-ibigroup miles-grant-ibigroup approved these changes

Assignees

@miles-grant-ibigroup miles-grant-ibigroup

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@leonardehrenfried @miles-grant-ibigroup @vesameskanen @testower @optionsome @VillePihlava @t2gran @miklcct @tkalvas