Skip to content

Actions: appsembler/edx-platform

Actions

Merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
report_conflicts.yml
69 workflow runs
69 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix: Handle Request objects in Segment fetch override Merge conflicts #1183: Pull request #1382 opened by amirtds
November 14, 2023 15:22 2m 12s fix/segment-fetch-interception
fix/segment-fetch-interception
November 14, 2023 15:22 2m 12s
edx-sga use v0.12.0-appsembler1 (0.12.0 but local js files) Merge conflicts #1182: Pull request #1381 opened by bryanlandia
September 27, 2023 22:26 2m 47s psu/use-sga-0.12.0
psu/use-sga-0.12.0
September 27, 2023 22:26 2m 47s
YoutTubeIframeAPIReady issue - Remove newer error handling code and try simple fix Merge conflicts #1181: Pull request #1379 opened by bryanlandia
September 20, 2023 00:02 2m 40s bugfix/ENG-97-rework-onytiframeapiready
bugfix/ENG-97-rework-onytiframeapiready
September 20, 2023 00:02 2m 40s
PennState Use edx-sga v0.12.0 Merge conflicts #1180: Pull request #1378 opened by bryanlandia
September 18, 2023 22:06 2m 39s psu/use-sga-0.12.0
psu/use-sga-0.12.0
September 18, 2023 22:06 2m 39s
Update from main (production) Merge conflicts #1179: Pull request #1376 synchronize by bryanlandia
September 15, 2023 22:29 3m 11s main
main
September 15, 2023 22:29 3m 11s
Upgrade edx-sga to v0.12.0 Merge conflicts #1178: Pull request #1375 synchronize by bryanlandia
September 15, 2023 22:07 4m 30s feat/edx-sga-to-v.0.12.0
feat/edx-sga-to-v.0.12.0
September 15, 2023 22:07 4m 30s
Upgrade edx-sga to v0.12.0 Merge conflicts #1177: Pull request #1375 opened by bryanlandia
September 15, 2023 21:45 2m 58s feat/edx-sga-to-v.0.12.0
feat/edx-sga-to-v.0.12.0
September 15, 2023 21:45 2m 58s
Revert to edx-sga v0.11.0 Appsembler fork Merge conflicts #1176: Pull request #1374 opened by bryanlandia
September 15, 2023 21:41 2m 38s bugfix/revert-edadd6d-edx-sga-v.0.22.0
bugfix/revert-edadd6d-edx-sga-v.0.22.0
September 15, 2023 21:41 2m 38s
Merge pull request #1370 from appsembler/bugfix/ENG-97-catch-and-retry-yt-api-errs Merge conflicts #1175: Pull request #1373 opened by bryanlandia
September 15, 2023 21:37 1m 57s bugfix/revert-edadd6d-edx-sga-v.0.22.0
bugfix/revert-edadd6d-edx-sga-v.0.22.0
September 15, 2023 21:37 1m 57s
Use edx-sga v0.16.0 Merge conflicts #1174: Pull request #1372 opened by bryanlandia
September 15, 2023 21:19 3m 15s bugfix/downgrade-edx-sga-to-v0.16-py35-compat
bugfix/downgrade-edx-sga-to-v0.16-py35-compat
September 15, 2023 21:19 3m 15s
ENG-97 Refactor try/catch for window.onYouTubeIframeAPIReady.resolve on video initialization Merge conflicts #1173: Pull request #1371 opened by bryanlandia
September 14, 2023 22:39 2m 47s bugfix/ENG-97-catch-and-retry-yt-api-errs
bugfix/ENG-97-catch-and-retry-yt-api-errs
September 14, 2023 22:39 2m 47s
Update from main (production) Merge conflicts #1172: Pull request #1369 synchronize by bryanlandia
September 14, 2023 17:11 2m 41s main
main
September 14, 2023 17:11 2m 41s
ENG-97 Try/Catch around more of the onYouTubeIframeAPIReady code to retry Merge conflicts #1171: Pull request #1370 opened by bryanlandia
September 13, 2023 22:26 2m 49s bugfix/ENG-97-catch-and-retry-yt-api-errs
bugfix/ENG-97-catch-and-retry-yt-api-errs
September 13, 2023 22:26 2m 49s
Fix version override: Use edx-sga 0.22.0 via appsembler.txt reqs Merge conflicts #1170: Pull request #1368 synchronize by bryanlandia
August 29, 2023 22:32 2m 39s bugfix/requirements-use-patched-edx-sga-0.22.0
bugfix/requirements-use-patched-edx-sga-0.22.0
August 29, 2023 22:32 2m 39s
Fix version override: Use edx-sga 0.22.0 via appsembler.txt reqs Merge conflicts #1169: Pull request #1368 opened by bryanlandia
August 29, 2023 22:21 3m 14s bugfix/requirements-use-patched-edx-sga-0.22.0
bugfix/requirements-use-patched-edx-sga-0.22.0
August 29, 2023 22:21 3m 14s
Update from main (production) Merge conflicts #1168: Pull request #1366 synchronize by bryanlandia
August 29, 2023 20:38 2m 43s main
main
August 29, 2023 20:38 2m 43s
Update messageId format for faked analytics.js event call Merge conflicts #1167: Pull request #1367 opened by bryanlandia
August 29, 2023 19:38 2m 49s bugfix/update-segment-events-for-fake-ajs-next
bugfix/update-segment-events-for-fake-ajs-next
August 29, 2023 19:38 2m 49s
Update Segment url intercepts for fetch-based Segment JS API Merge conflicts #1166: Pull request #1365 opened by bryanlandia
August 29, 2023 02:06 7m 38s bugfix/fix-segment-replication-for-fetch-js
bugfix/fix-segment-replication-for-fetch-js
August 29, 2023 02:06 7m 38s
Use tahoe-idp 2.6.0 Merge conflicts #1165: Pull request #1363 opened by bryanlandia
August 23, 2023 23:04 2m 47s feat/tahoe-idp-2.6.0
feat/tahoe-idp-2.6.0
August 23, 2023 23:04 2m 47s