Skip to content

Actions: appsembler/edx-platform

Actions

Merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
report_conflicts.yml
129 workflow runs
129 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

revert last changes Merge conflicts #1233: Pull request #1418 synchronize by VladyslavTy
August 28, 2024 13:33 2m 12s vladyslav/hide-html-elements-in-iframe
vladyslav/hide-html-elements-in-iframe
August 28, 2024 13:33 2m 12s
revert last changes Merge conflicts #1232: Pull request #1418 opened by VladyslavTy
August 28, 2024 13:33 2m 11s vladyslav/hide-html-elements-in-iframe
vladyslav/hide-html-elements-in-iframe
August 28, 2024 13:33 2m 11s
Add function to set hideElements cookie Merge conflicts #1231: Pull request #1416 opened by VladyslavTy
August 27, 2024 12:25 2m 19s vladyslav/hide-html-elements-in-iframe
vladyslav/hide-html-elements-in-iframe
August 27, 2024 12:25 2m 19s
Hide html elements by parameter Merge conflicts #1230: Pull request #1414 opened by VladyslavTy
August 23, 2024 08:11 2m 17s vladyslav/hide-html-elements-in-iframe
vladyslav/hide-html-elements-in-iframe
August 23, 2024 08:11 2m 17s
Set cookie value ror hideElements before redirect Merge conflicts #1229: Pull request #1412 opened by VladyslavTy
August 22, 2024 07:29 2m 22s vladyslav/hide-html-elements-in-iframe
vladyslav/hide-html-elements-in-iframe
August 22, 2024 07:29 2m 22s
Update from main (production) Merge conflicts #1228: Pull request #1410 synchronize by VladyslavTy
August 19, 2024 08:16 2m 19s main
main
August 19, 2024 08:16 2m 19s
Hide html elements if the parameter is set Merge conflicts #1227: Pull request #1411 opened by VladyslavTy
August 16, 2024 15:05 2m 20s vladyslav/hide-html-elements-in-iframe
vladyslav/hide-html-elements-in-iframe
August 16, 2024 15:05 2m 20s
Hide site elements if render in iframe Merge conflicts #1226: Pull request #1409 synchronize by VladyslavTy
August 14, 2024 07:13 2m 19s vladyslav/hide-html-elements-in-iframe
vladyslav/hide-html-elements-in-iframe
August 14, 2024 07:13 2m 19s
Hide site elements if render in iframe Merge conflicts #1225: Pull request #1409 opened by VladyslavTy
August 13, 2024 16:01 2m 11s vladyslav/hide-html-elements-in-iframe
vladyslav/hide-html-elements-in-iframe
August 13, 2024 16:01 2m 11s
Update from main (production) Merge conflicts #1224: Pull request #1408 opened by VladyslavTy
July 22, 2024 11:40 2m 11s main
main
July 22, 2024 11:40 2m 11s
Improve the sanitize_next_parameter method with handling new cases Merge conflicts #1223: Pull request #1407 synchronize by VladyslavTy
July 22, 2024 08:27 2m 10s vladyslav/improve-sanitize-url-method
vladyslav/improve-sanitize-url-method
July 22, 2024 08:27 2m 10s
Improve the sanitize_next_parameter method with handling new cases Merge conflicts #1222: Pull request #1407 opened by VladyslavTy
July 19, 2024 14:54 2m 16s vladyslav/improve-sanitize-url-method
vladyslav/improve-sanitize-url-method
July 19, 2024 14:54 2m 16s
Update from main (production) Merge conflicts #1221: Pull request #1406 opened by VladyslavTy
July 17, 2024 07:05 2m 14s main
main
July 17, 2024 07:05 2m 14s
Add sanitize function for redirect parameter next Merge conflicts #1220: Pull request #1401 synchronize by VladyslavTy
July 16, 2024 12:42 2m 14s vladyslav/add-sanitize-next-parameter-helper
vladyslav/add-sanitize-next-parameter-helper
July 16, 2024 12:42 2m 14s
Fix workflow configurations Merge conflicts #1219: Pull request #1405 opened by VladyslavTy
July 16, 2024 10:00 2m 26s fix/fix-workflow-configurations
fix/fix-workflow-configurations
July 16, 2024 10:00 2m 26s
Fix workflow issues Merge conflicts #1218: Pull request #1404 opened by VladyslavTy
July 16, 2024 09:26 2m 7s fix/fix-workflow-configurations
fix/fix-workflow-configurations
July 16, 2024 09:26 2m 7s
Change upstream_repo variable to actual value Merge conflicts #1217: Pull request #1403 opened by VladyslavTy
July 15, 2024 14:38 2m 20s fix/report-conflicts-workflow
fix/report-conflicts-workflow
July 15, 2024 14:38 2m 20s
Add sanitize function for redirect parameter next Merge conflicts #1216: Pull request #1402 opened by VladyslavTy
July 15, 2024 12:12 1m 25s fix/add-sanitize-method
fix/add-sanitize-method
July 15, 2024 12:12 1m 25s
Add sanitize function for redirect parameter next Merge conflicts #1215: Pull request #1401 opened by VladyslavTy
July 2, 2024 16:14 1m 37s vladyslav/add-sanitize-next-parameter-helper
vladyslav/add-sanitize-next-parameter-helper
July 2, 2024 16:14 1m 37s
Bump tar and node-sass Merge conflicts #1214: Pull request #1399 opened by dependabot bot
April 10, 2024 03:41 1m 24s dependabot/npm_and_yarn/multi-fb9f2361c8
dependabot/npm_and_yarn/multi-fb9f2361c8
April 10, 2024 03:41 1m 24s
Bump webpack-dev-middleware and karma-webpack Merge conflicts #1213: Pull request #1398 opened by dependabot bot
March 21, 2024 20:37 2m 14s dependabot/npm_and_yarn/webpack-dev-middleware-and-karma-webpack--removed
dependabot/npm_and_yarn/webpack-dev-middleware-and-karma-webpack--removed
March 21, 2024 20:37 2m 14s
Bump tar and node-sass Merge conflicts #1212: Pull request #1397 opened by dependabot bot
February 3, 2024 08:46 2m 20s dependabot/npm_and_yarn/tar-and-node-sass-6.2.0
dependabot/npm_and_yarn/tar-and-node-sass-6.2.0
February 3, 2024 08:46 2m 20s
fix: Updated settings.py to dynamically populate ALLOWED_HOSTS using domains from the Django sites. Merge conflicts #1211: Pull request #1384 synchronize by amirtds
January 29, 2024 17:58 2m 17s fix/host-header-injection-vulnerabilit
fix/host-header-injection-vulnerabilit
January 29, 2024 17:58 2m 17s
fix: Updated settings.py to dynamically populate ALLOWED_HOSTS using domains from the Django sites. Merge conflicts #1210: Pull request #1384 synchronize by amirtds
January 27, 2024 22:08 2m 13s fix/host-header-injection-vulnerabilit
fix/host-header-injection-vulnerabilit
January 27, 2024 22:08 2m 13s
feat: Add Mandrill Subaccount support Merge conflicts #1209: Pull request #1396 opened by amirtds
January 27, 2024 21:36 2m 10s feat/add-mandrill-subaccount-support
feat/add-mandrill-subaccount-support
January 27, 2024 21:36 2m 10s