copilot-swe-agent[bot]
|
4266b933f5
|
Merge remote-tracking branch 'origin/master' into fix-permission-checks-for-subuser-endpoints
# Conflicts:
# services/nginx/app/routes/subusersRoute.php
|
2026-06-01 22:41:35 +00:00 |
|
copilot-swe-agent[bot]
|
d24b50f751
|
Plan: Resolve merge conflicts in index.php autoloader
|
2026-06-01 22:36:09 +00:00 |
|
copilot-swe-agent[bot]
|
51c619b0c6
|
Resolve merge conflicts in departmentLanesRoute.php
|
2026-06-01 22:29:49 +00:00 |
|
copilot-swe-agent[bot]
|
fe9daf1bf2
|
Merge remote-tracking branch 'origin/master' into fix-unauthenticated-bird-voice-webhook
# Conflicts:
# services/nginx/app/routes/birdVoiceWebhooksRoute.php
|
2026-06-01 22:27:40 +00:00 |
|
copilot-swe-agent[bot]
|
9c2d7140b4
|
Merge master into branch to resolve conflicts
|
2026-06-01 22:27:04 +00:00 |
|
copilot-swe-agent[bot]
|
1505464095
|
Plan: Resolve merge conflicts with master
|
2026-06-01 22:25:49 +00:00 |
|
copilot-swe-agent[bot]
|
6489706231
|
Merge master and resolve conflicts
- Retained security improvements from master (token detection, cache prep, safe directory)
- Applied security hardening by pinning actions/checkout@v4 to commit SHA 11bd71901bbe5b1630ceea73d27597364c9af683
- Added persist-credentials: false to checkout step to prevent credential exposure
|
2026-06-01 22:14:21 +00:00 |
|
copilot-swe-agent[bot]
|
a81e239de8
|
Merge master into branch and resolve code_quality.yml comment conflict
|
2026-06-01 21:42:21 +00:00 |
|
copilot-swe-agent[bot]
|
3555904423
|
Merge origin/master and resolve invoice_period_flag_service conflict
|
2026-06-01 21:37:53 +00:00 |
|
copilot-swe-agent[bot]
|
b1647b4ad1
|
Merge origin/master and resolve orderBookingsPost conflict
|
2026-06-01 21:25:58 +00:00 |
|
copilot-swe-agent[bot]
|
64d7e6f061
|
Merge master into fix-system-search-associations-vulnerability
|
2026-06-01 21:25:51 +00:00 |
|
copilot-swe-agent[bot]
|
06cba73a30
|
Initialize merge conflict resolution plan
|
2026-06-01 21:23:50 +00:00 |
|
copilot-swe-agent[bot]
|
1065973b33
|
Merge master into fix-sql-injection-in-vehicle-plate-lookup
|
2026-06-01 21:07:49 +00:00 |
|
copilot-swe-agent[bot]
|
c79219eb00
|
Merge remote-tracking branch 'origin/master' into fix-order-item-update-idor-vulnerability
# Conflicts:
# services/nginx/app/routes/orderItemsRoute.php
|
2026-06-01 20:58:04 +00:00 |
|
copilot-swe-agent[bot]
|
6995c3d1bc
|
Merge origin/master and resolve orders_o conflict
|
2026-06-01 20:57:44 +00:00 |
|
copilot-swe-agent[bot]
|
18bf7aa013
|
Resolve merge conflict: combine invoice collection ownership validation with auto-reassign guard
|
2026-06-01 20:53:42 +00:00 |
|
copilot-swe-agent[bot]
|
ded497b3d8
|
Merge remote-tracking branch 'origin/master' into fix-missing-department-access-checks
# Conflicts:
# services/nginx/app/routes/departmentsRoute.php
|
2026-06-01 20:43:01 +00:00 |
|
copilot-swe-agent[bot]
|
2fd3ce4877
|
Merge remote-tracking branch 'origin/master' into fix-department-lanes-access-vulnerability
# Conflicts:
# services/nginx/app/routes/departmentLanesRoute.php
|
2026-06-01 20:42:43 +00:00 |
|
copilot-swe-agent[bot]
|
64fc70a0a8
|
Merge remote-tracking branch 'origin/master' into fix-lane-ownership-validation-for-commands
# Conflicts:
# services/nginx/app/routes/moduleSelfServeRoute.php
|
2026-06-01 20:41:57 +00:00 |
|
copilot-swe-agent[bot]
|
eedde6c6d7
|
Merge origin/master and resolve orders_o conflict
|
2026-06-01 20:41:18 +00:00 |
|
copilot-swe-agent[bot]
|
2782afde2e
|
Merge master into branch and re-apply department access checks on Stripe payment-intent routes
|
2026-06-01 20:40:30 +00:00 |
|
copilot-swe-agent[bot]
|
fbe700a4db
|
Merge remote-tracking branch 'origin/master' into fix-subuser-tokens-allowing-user-impersonation
# Conflicts:
# services/nginx/app/classes/authentication.php
|
2026-06-01 20:39:16 +00:00 |
|
copilot-swe-agent[bot]
|
4e9575cd87
|
Merge master and resolve conflict: use rawToken in get_user() exception-handled lookup
|
2026-06-01 20:35:51 +00:00 |
|
copilot-swe-agent[bot]
|
334a7a4401
|
Merge origin/master into propose-fix-for-edge-broker-vulnerability, resolving conflicts
|
2026-06-01 20:34:47 +00:00 |
|
copilot-swe-agent[bot]
|
a828e9bc25
|
Merge origin/master into propose-fix-for-edge-broker-vulnerability, resolving all conflicts
|
2026-06-01 20:27:11 +00:00 |
|
copilot-swe-agent[bot]
|
8d2e71aaf3
|
Merge origin/master and resolve self-serve relay sync conflicts
|
2026-06-01 20:23:09 +00:00 |
|
copilot-swe-agent[bot]
|
cb63d10415
|
Merge origin/master into fix-edge-broker-default-shared-secret-issue
|
2026-06-01 20:12:06 +00:00 |
|
copilot-swe-agent[bot]
|
8e6b29810a
|
Clean up resolved gitignore merge
|
2026-06-01 20:08:24 +00:00 |
|
copilot-swe-agent[bot]
|
989d04167a
|
Resolve .gitignore merge conflict with master
|
2026-06-01 20:07:48 +00:00 |
|
copilot-swe-agent[bot]
|
2ba87a4850
|
Start merge conflict resolution
|
2026-06-01 20:06:07 +00:00 |
|
copilot-swe-agent[bot]
|
3107779b74
|
Resolve merge conflicts with origin/master
|
2026-06-01 20:02:21 +00:00 |
|
copilot-swe-agent[bot]
|
7c21b6463d
|
Merge origin/master and resolve workflow conflicts
|
2026-06-01 19:55:27 +00:00 |
|
copilot-swe-agent[bot]
|
ab957092bd
|
Merge origin/master into propose-fix-for-exposure-of-sensitive-logs
|
2026-06-01 19:03:25 +00:00 |
|
copilot-swe-agent[bot]
|
b8f65f242f
|
Merge origin/master and resolve property gate conflict
|
2026-06-01 19:02:11 +00:00 |
|
copilot-swe-agent[bot]
|
933b18b988
|
Merge origin/master and resolve booking conflict files
|
2026-06-01 18:59:05 +00:00 |
|
copilot-swe-agent[bot]
|
a3e2765ad4
|
Merge origin/master and resolve XLVask route contract conflict
|
2026-06-01 18:57:46 +00:00 |
|
copilot-swe-agent[bot]
|
160772b832
|
Merge origin/master and resolve invoice billing test conflict
|
2026-06-01 17:52:21 +00:00 |
|
copilot-swe-agent[bot]
|
31214f0af0
|
fix: mark workspace as git safe directory before qodana
|
2026-05-28 17:34:58 +00:00 |
|
copilot-swe-agent[bot]
|
cd0e0f0e61
|
Initial plan
|
2026-05-28 17:30:45 +00:00 |
|
copilot-swe-agent[bot]
|
0db6b5269d
|
Merge origin/master and resolve replication route conflict
|
2026-05-28 17:29:12 +00:00 |
|
 copilot-swe-agent[bot]andjepp9350
|
7f6ab7ec18
|
Add comprehensive openapi.yaml documentation for all API routes and schemas
Co-authored-by: jepp9350 <17977216+jepp9350@users.noreply.github.com>
|
2026-01-05 10:34:48 +00:00 |
|
copilot-swe-agent[bot]
|
3b90f874a2
|
Initial plan
|
2026-01-05 10:28:59 +00:00 |
|