master<-dev #1359

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

Merged

TinyKitten merged 12 commits into master from dev

Jan 4, 2026

.env

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
     ## API
     DATABASE_URL=postgresql://stationapi:stationapi@localhost/stationapi
-    DISABLE_GRPC_WEB=false
+    DISABLE_BUS_FEATURE=false
+    DISABLE_GRPC_WEB=false

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,5 @@ server.crt @@
     server.key
     api_descriptor.pb
     tmp.sql
-    .vscode/
+    .vscode/
+    data/ToeiBus-GTFS/

...2048f361c5e9ac82cb7503fd8e75266cc06f.json → ...3906213e6ec80d495a2fe569ccf1d94b4834.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

...b3448c8ca29cbdb5e6f2390d2b22b886f81e.json → ...12043461a1461884f8461dfc6235208825a6.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

...d1aaa9d6a8e3705162b694ac4d34bf5b4fbe.json → ...c41b55e885ccd4bd3ca4bcae1f7336742d3f.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.