テキスト比較

2 つのテキストファイルの違いを見つける

ライブエディター

空白の変更を非表示

未変更行を折りたたむ

折り返しなし

レイアウト

比較精度

テキストスタイル

シンタックスハイライト

Diffchecker Desktop Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手：あなたの差分はコンピューターから出ることはありません！Desktopを入手

open-craft/edx-platform#471

作成日 4 年前差分は期限切れになりません

71 削除

行
合計
削除

文字
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

30 行

28 追加

行
合計
追加

文字
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

35 行

## Description

This PR prepares the shared `opencraft-release/maple.3` branch for our fork of https://github.com/openedx/edx-platform.

[Code-drift commits](https://github.com/openedx/edx-platform/compare/open-release/lilac.2...open-craft:opencraft-release/lilac.2)

| ---------- | ----------------- | ------------------ | --------------------------------- | --------- |

| https://github.com/open-craft/edx-platform/commit/1a218245371e7a9d3e73ceab8e49bfd7f3922fe7 | [BB-4951](https://tasks.opencraft.com/browse/BB-4951) | [link](https://github.com/openedx/edx-platform/pull/30348) | ✅ [yes] | Backport PR to upstream maple raised but not merged yet |

| openedx/edx-platform@1a218245371e7a9d3e73ceab8e49bfd7f3922fe7 | [BB-4951](https://tasks.opencraft.com/browse/BB-4951) | ⌛ https://github.com/openedx/edx-platform/pull/30348 | ✅ | Backport PR to upstream maple raised but not merged yet |

| https://github.com/open-craft/edx-platform/commit/8ae40dc77bc99110e7dfca8125396becd8937282 | [BB-5090](https://tasks.opencraft.com/browse/BB-5090) | ❌ ([closed](https://github.com/openedx/edx-platform/pull/29316)) | ❌ | moved to client's theme repo |

| https://github.com/open-craft/edx-platform/commit/c8713a5d5d200e9366857eeb4896b3b70f3a7586 | [BB-1389](https://tasks.opencraft.com/browse/BB-1389) | ❌ | ✅ [yes] | this endpoint is really slow, so we shouldn't upstream it until [BB-5591](https://tasks.opencraft.com/browse/BB-5591) is done |

| openedx/edx-platform@c8713a5d5d200e9366857eeb4896b3b70f3a7586 | [BB-1389](https://tasks.opencraft.com/browse/BB-1389) | ❌ | ✅ | this endpoint is really slow, so we shouldn't upstream it until [BB-5591](https://tasks.opencraft.com/browse/BB-5591) is done |

| https://github.com/open-craft/edx-platform/commit/f126cee8f083dfca96a1df8614f350930f70a2e8 | [BB-5861](https://tasks.opencraft.com/browse/BB-5861) | [link](https://github.com/edx/xblock-lti-consumer/pull/150) | ❌ | Already merged into upstream maple |

| https://github.com/open-craft/edx-platform/commit/6ca5a4539b10f117af602a25f844a5c73d3856e5 | [BB-5815](https://tasks.opencraft.com/browse/BB-5815) | [link](https://github.com/edx/edx-platform/pull/27857) | ✅ [yes] | Upstream PR not merged yet |

| https://github.com/open-craft/edx-platform/commit/8ece59cae90781748db51a3ac71b892c03396142 | [SE-4304](https://tasks.opencraft.com/browse/SE-4304) | ❌ | ❌ | CELERYBEAT_SCHEDULER option is configured for maple in a different way |

| https://github.com/open-craft/edx-platform/commit/bd0e5764bfba281e963d2504af0b9cda0ced71eb | [FAL-2248](https://tasks.opencraft.com/browse/FAL-2248) | ❌ | ✅ [yes] | Fix is in django 4 so this will be needed until Open EdX moved to django 4 |

| https://github.com/open-craft/edx-platform/commit/e3045274809f50f0a720ab67e0cf8e5f9ec410c8 | [BB-5849](https://tasks.opencraft.com/browse/BB-5849) | [link](https://github.com/openedx/edx-platform/pull/30373) | ✅ [yes] | Backport PR to upstream maple raised but not merged yet |

| https://github.com/open-craft/edx-platform/commit/9726d149e941bc4ed72e91914352d63abf7c18ef | [BB-4381](https://tasks.opencraft.com/browse/BB-4381) | [link](https://github.com/openedx/edx-platform/pull/28861) | ✅ [yes] | Upstream PR merged to master but is yet to be backported to maple |

| openedx/edx-platform@9726d149e941bc4ed72e91914352d63abf7c18ef | [BB-4381](https://tasks.opencraft.com/browse/BB-4381) | https://github.com/openedx/edx-platform/pull/28861 | ✅ | Upstream PR merged to master but is yet to be backported to maple |

| https://github.com/open-craft/edx-platform/commit/3db5513632d946800a56b8103cc76325feba1167 | [BB-5815](https://tasks.opencraft.com/browse/BB-5815) | [link](https://github.com/openedx/edx-platform/pull/27857) | ✅ [yes] | Upstream PR not merged yet |

| https://github.com/open-craft/edx-platform/commit/406b0ab0c12397754c594af4fd6c361cf48ec5e8 | [BB-5271](https://tasks.opencraft.com/browse/BB-5271) | [link](https://github.com/openedx/edx-platform/pull/29674) | ✅ [yes] | Upstream PR not merged yet |

| https://github.com/open-craft/edx-platform/commit/7da10ab3ec2c6482c875a03507e952cf8d0fa370 | [BB-5819](https://tasks.opencraft.com/browse/BB-5819) | [link](https://github.com/openedx/edx-platform/pull/29850) | ✅ [yes] | Upstream PR not merged yet |

| https://github.com/open-craft/edx-platform/commit/a20514c351c5a9aeed665e33141fbaba2edea371 | [BB-5429](https://tasks.opencraft.com/browse/BB-5429) | [link](https://github.com/openedx/edx-platform/pull/30314) | ✅ [yes] | Upstream PR not merged yet |

| https://github.com/open-craft/edx-platform/commit/5c999dc87bec62082c8d35ef86dbef8ce9b9805a | [SE-5299](https://tasks.opencraft.com/browse/SE-5299) | [link](https://github.com/openedx/edx-platform/pull/30422) | ✅ [yes] | Backport PR to upstream maple raised but not merged yet |

| openedx/edx-platform@4e342d37b95f8a190fe2bc95b4a9c8a677350963 | [SE-5299](https://tasks.opencraft.com/browse/SE-5299) | https://github.com/openedx/edx-platform/pull/30422 | ✅ | Backport PR to upstream maple raised but not merged yet |

| https://github.com/open-craft/edx-platform/commit/9ef019e41095aecb586aaf83b59c2f7a05c32b7a | [BB-6041](https://tasks.opencraft.com/browse/BB-6041) | [link](https://github.com/openedx/edx-platform/pull/30130) | ✅ [yes] | Upstream PR merged to master but is yet to be backported to maple |

| openedx/edx-platform@9ef019e41095aecb586aaf83b59c2f7a05c32b7a | [BB-6041](https://tasks.opencraft.com/browse/BB-6041) | https://github.com/openedx/edx-platform/pull/30130 | ✅ | Upstream PR merged to master but is yet to be backported to maple |

| https://github.com/open-craft/edx-platform/commit/6a228a8ef94e86b9753b7020739f10baf6fa7edf | [SE-4860](https://tasks.opencraft.com/browse/SE-4860) | | | Handled as part of [BB-6123](https://tasks.opencraft.com/browse/BB-6123) |

| openedx/edx-platform@6a228a8ef94e86b9753b7020739f10baf6fa7edf | [SE-4860](https://tasks.opencraft.com/browse/SE-4860) | | | Handled as part of [BB-6123](https://tasks.opencraft.com/browse/BB-6123) |

| openedx/edx-platform@2b39da69b96482976fedcf08bae16c1ebabae372 | [BB-5258](https://tasks.opencraft.com/browse/BB-5258) | ⌛ https://github.com/openedx/edx-platform/pull/29728 | ✅ | |

保存された差分

原文

ファイルを開く

## Description

This PR prepares the shared `opencraft-release/maple.3` branch for our fork of https://github.com/openedx/edx-platform.

[Code-drift commits](https://github.com/openedx/edx-platform/compare/open-release/lilac.2...open-craft:opencraft-release/lilac.2)

| Commit | Related Task | Upstream PR | Should be cherrypicked? | Notes |
| ---------- | ----------------- | ------------------ | --------------------------------- | --------- |
| https://github.com/open-craft/edx-platform/commit/1a218245371e7a9d3e73ceab8e49bfd7f3922fe7 | [BB-4951](https://tasks.opencraft.com/browse/BB-4951) | [link](https://github.com/openedx/edx-platform/pull/30348) | ✅ [yes] | Backport PR to upstream maple raised but not merged yet |
| https://github.com/open-craft/edx-platform/commit/8ae40dc77bc99110e7dfca8125396becd8937282 | [BB-5090](https://tasks.opencraft.com/browse/BB-5090) | ❌ ([closed](https://github.com/openedx/edx-platform/pull/29316)) | ❌ | moved to client's theme repo |
| https://github.com/open-craft/edx-platform/commit/c8713a5d5d200e9366857eeb4896b3b70f3a7586 | [BB-1389](https://tasks.opencraft.com/browse/BB-1389) | ❌ | ✅ [yes] | this endpoint is really slow, so we shouldn't upstream it until [BB-5591](https://tasks.opencraft.com/browse/BB-5591) is done |
| https://github.com/open-craft/edx-platform/commit/1c797fa1681dd65d39d2a5747fdacc313e0dea82 | [BB-3384](https://tasks.opencraft.com/browse/BB-3384) | ❌ | ❌ | moved to client's theme repo |
| https://github.com/open-craft/edx-platform/commit/f126cee8f083dfca96a1df8614f350930f70a2e8 | [BB-5861](https://tasks.opencraft.com/browse/BB-5861) | [link](https://github.com/edx/xblock-lti-consumer/pull/150) | ❌ | Already merged into upstream maple |
| https://github.com/open-craft/edx-platform/commit/709e1b407495b2dd2c7b8aae7a70a138d49d666b | [BB-5804](https://tasks.opencraft.com/browse/BB-5804) | ❌ | ❌ | Reverted - not needed anymore |
| https://github.com/open-craft/edx-platform/commit/f5343d6b5cf8c6f91116e867fa1270a175f5dd4e | [BB-4281](https://tasks.opencraft.com/browse/BB-4218) | ❌ | ❌ | Client no longer with us - not needed anymore |
| https://github.com/open-craft/edx-platform/commit/6ca5a4539b10f117af602a25f844a5c73d3856e5 | [BB-5815](https://tasks.opencraft.com/browse/BB-5815) | [link](https://github.com/edx/edx-platform/pull/27857) | ✅ [yes] | Upstream PR not merged yet |
| https://github.com/open-craft/edx-platform/commit/8ece59cae90781748db51a3ac71b892c03396142 | [SE-4304](https://tasks.opencraft.com/browse/SE-4304) | ❌ | ❌ | CELERYBEAT_SCHEDULER option is configured for maple in a different way |
| https://github.com/open-craft/edx-platform/commit/bd0e5764bfba281e963d2504af0b9cda0ced71eb | [FAL-2248](https://tasks.opencraft.com/browse/FAL-2248) | ❌ | ✅ [yes] | Fix is in django 4 so this will be needed until Open EdX moved to django 4 |
| https://github.com/open-craft/edx-platform/commit/7460a2be7ad17e7e546191c9b89d793f6491c60a | [BB-5437](https://tasks.opencraft.com/browse/BB-5437) | ❌ | ❌ | moved to client's theme repo |
| https://github.com/open-craft/edx-platform/commit/e3045274809f50f0a720ab67e0cf8e5f9ec410c8 | [BB-5849](https://tasks.opencraft.com/browse/BB-5849) | [link](https://github.com/openedx/edx-platform/pull/30373) | ✅ [yes] | Backport PR to upstream maple raised but not merged yet |
| https://github.com/open-craft/edx-platform/commit/9726d149e941bc4ed72e91914352d63abf7c18ef | [BB-4381](https://tasks.opencraft.com/browse/BB-4381) | [link](https://github.com/openedx/edx-platform/pull/28861) | ✅ [yes] | Upstream PR merged to master but is yet to be backported to maple |
| https://github.com/open-craft/edx-platform/commit/6eb46c1eba79730f77cd0cb4c8961b56b39d0ff3 | [SE-3248](https://tasks.opencraft.com/browse/SE-3248) | ❌ | ❌ | client no longer with us - change not used anymore |
| https://github.com/open-craft/edx-platform/commit/8ca8b60745ab00d3d78d5f78e200cc371720c4d3 | [FAL-867](https://tasks.opencraft.com/browse/FAL-867) | ❌ | ✅ [yes] | Upstream rejected it but we still need it |
| https://github.com/open-craft/edx-platform/commit/3db5513632d946800a56b8103cc76325feba1167 | [BB-5815](https://tasks.opencraft.com/browse/BB-5815) | [link](https://github.com/openedx/edx-platform/pull/27857) | ✅ [yes] | Upstream PR not merged yet |
| https://github.com/open-craft/edx-platform/commit/406b0ab0c12397754c594af4fd6c361cf48ec5e8 | [BB-5271](https://tasks.opencraft.com/browse/BB-5271) | [link](https://github.com/openedx/edx-platform/pull/29674) | ✅ [yes] | Upstream PR not merged yet |
| https://github.com/open-craft/edx-platform/commit/7da10ab3ec2c6482c875a03507e952cf8d0fa370 | [BB-5819](https://tasks.opencraft.com/browse/BB-5819) | [link](https://github.com/openedx/edx-platform/pull/29850) | ✅ [yes] | Upstream PR not merged yet |
| https://github.com/open-craft/edx-platform/commit/a20514c351c5a9aeed665e33141fbaba2edea371 | [BB-5429](https://tasks.opencraft.com/browse/BB-5429) | [link](https://github.com/openedx/edx-platform/pull/30314) | ✅ [yes] | Upstream PR not merged yet |
| https://github.com/open-craft/edx-platform/commit/5c999dc87bec62082c8d35ef86dbef8ce9b9805a | [SE-5299](https://tasks.opencraft.com/browse/SE-5299) | [link](https://github.com/openedx/edx-platform/pull/30422) | ✅ [yes] | Backport PR to upstream maple raised but not merged yet |
| https://github.com/open-craft/edx-platform/commit/9ef019e41095aecb586aaf83b59c2f7a05c32b7a | [BB-6041](https://tasks.opencraft.com/browse/BB-6041) | [link](https://github.com/openedx/edx-platform/pull/30130) | ✅ [yes] | Upstream PR merged to master but is yet to be backported to maple |
| https://github.com/open-craft/edx-platform/commit/6a228a8ef94e86b9753b7020739f10baf6fa7edf | [SE-4860](https://tasks.opencraft.com/browse/SE-4860) | | | Handled as part of [BB-6123](https://tasks.opencraft.com/browse/BB-6123) |

変更されたテキスト

ファイルを開く

## Description

This PR prepares the shared `opencraft-release/maple.3` branch for our fork of https://github.com/openedx/edx-platform.

[Code-drift commits](https://github.com/openedx/edx-platform/compare/open-release/lilac.2...open-craft:opencraft-release/lilac.2)

| Commit | Related Task | Upstream PR | Should be cherry-picked? | Notes |
| ---------- | ----------------- | ------------------ | --------------------------------- | --------- |
| openedx/edx-platform@1a218245371e7a9d3e73ceab8e49bfd7f3922fe7 | [BB-4951](https://tasks.opencraft.com/browse/BB-4951) | ⌛ https://github.com/openedx/edx-platform/pull/30348 | ✅ | Backport PR to upstream maple raised but not merged yet |
| 8ae40dc77bc99110e7dfca8125396becd8937282 | [BB-5090](https://tasks.opencraft.com/browse/BB-5090) | ❌ https://github.com/openedx/edx-platform/pull/29316 | ❌ | moved to client's theme repo |
| openedx/edx-platform@c8713a5d5d200e9366857eeb4896b3b70f3a7586 | [BB-1389](https://tasks.opencraft.com/browse/BB-1389) | ❌ | ✅ | this endpoint is really slow, so we shouldn't upstream it until [BB-5591](https://tasks.opencraft.com/browse/BB-5591) is done |
| 1c797fa1681dd65d39d2a5747fdacc313e0dea82 | [BB-3384](https://tasks.opencraft.com/browse/BB-3384) | ❌ | ❌ | moved to client's theme repo |
| f126cee8f083dfca96a1df8614f350930f70a2e8 | [BB-5861](https://tasks.opencraft.com/browse/BB-5861) | https://github.com/edx/xblock-lti-consumer/pull/150 | ❌ | Already merged into upstream maple |
| 709e1b407495b2dd2c7b8aae7a70a138d49d666b | [BB-5804](https://tasks.opencraft.com/browse/BB-5804) | ❌ | ❌ | Reverted - not needed anymore |
| f5343d6b5cf8c6f91116e867fa1270a175f5dd4e | [BB-4281](https://tasks.opencraft.com/browse/BB-4218) | ❌ | ❌ | Client no longer with us - not needed anymore |
| 6ca5a4539b10f117af602a25f844a5c73d3856e5 | [BB-5815](https://tasks.opencraft.com/browse/BB-5815) | ⌛ https://github.com/edx/edx-platform/pull/27857 | ✅ | Upstream PR not merged yet |
| 8ece59cae90781748db51a3ac71b892c03396142 | [SE-4304](https://tasks.opencraft.com/browse/SE-4304) | ❌ | ❌ | CELERYBEAT_SCHEDULER option is configured for maple in a different way |
| bd0e5764bfba281e963d2504af0b9cda0ced71eb | [FAL-2248](https://tasks.opencraft.com/browse/FAL-2248) | ❌ | ✅ | Fix is in django 4 so this will be needed until Open EdX moved to django 4 |
| 7460a2be7ad17e7e546191c9b89d793f6491c60a | [BB-5437](https://tasks.opencraft.com/browse/BB-5437) | ❌ | ❌ | moved to client's theme repo |
| e3045274809f50f0a720ab67e0cf8e5f9ec410c8 | [BB-5849](https://tasks.opencraft.com/browse/BB-5849) | https://github.com/openedx/edx-platform/pull/30373 | ✅ | Backport PR to upstream maple raised but not merged yet |
| openedx/edx-platform@9726d149e941bc4ed72e91914352d63abf7c18ef | [BB-4381](https://tasks.opencraft.com/browse/BB-4381) | https://github.com/openedx/edx-platform/pull/28861 | ✅ | Upstream PR merged to master but is yet to be backported to maple |
| 6eb46c1eba79730f77cd0cb4c8961b56b39d0ff3 | [SE-3248](https://tasks.opencraft.com/browse/SE-3248) | ❌ | ❌ | client no longer with us - change not used anymore |
| 8ca8b60745ab00d3d78d5f78e200cc371720c4d3 | [FAL-867](https://tasks.opencraft.com/browse/FAL-867) | ❌ | ✅ | Upstream rejected it but we still need it |
| 3db5513632d946800a56b8103cc76325feba1167 | [BB-5815](https://tasks.opencraft.com/browse/BB-5815) | ⌛ https://github.com/openedx/edx-platform/pull/27857 | ✅ | Upstream PR not merged yet |
| 406b0ab0c12397754c594af4fd6c361cf48ec5e8 | [BB-5271](https://tasks.opencraft.com/browse/BB-5271) | ⌛ https://github.com/openedx/edx-platform/pull/29674 | ✅ | |
| 7da10ab3ec2c6482c875a03507e952cf8d0fa370 | [BB-5819](https://tasks.opencraft.com/browse/BB-5819) | ⌛ https://github.com/openedx/edx-platform/pull/29850 | ✅ | |
| a20514c351c5a9aeed665e33141fbaba2edea371 | [BB-5429](https://tasks.opencraft.com/browse/BB-5429) | ⌛ https://github.com/openedx/edx-platform/pull/30314 | ✅ | |
| openedx/edx-platform@4e342d37b95f8a190fe2bc95b4a9c8a677350963 | [SE-5299](https://tasks.opencraft.com/browse/SE-5299) | https://github.com/openedx/edx-platform/pull/30422 | ✅ | Backport PR to upstream maple raised but not merged yet |
| openedx/edx-platform@9ef019e41095aecb586aaf83b59c2f7a05c32b7a | [BB-6041](https://tasks.opencraft.com/browse/BB-6041) | https://github.com/openedx/edx-platform/pull/30130 | ✅ | Upstream PR merged to master but is yet to be backported to maple |
| openedx/edx-platform@6a228a8ef94e86b9753b7020739f10baf6fa7edf | [SE-4860](https://tasks.opencraft.com/browse/SE-4860) | | | Handled as part of [BB-6123](https://tasks.opencraft.com/browse/BB-6123) |
| openedx/edx-platform@e633cc9c249a31f308ac67036b7a62609fb29499 | [BB-4060](https://tasks.opencraft.com/browse/BB-4060) | https://github.com/openedx/edx-platform/pull/27466 | ✅ | Present in Nutmeg. |
| openedx/edx-platform@d05e5c639f1c58029a75de041a19d0ca47c9f501 | [BB-4503](https://tasks.opencraft.com/browse/BB-4503) | https://github.com/edx/edx-platform/pull/28268 | ✅ | Present in Nutmeg. |
| openedx/edx-platform@0ef57eb136914a4dd0de1396095c80d8eddf73ac | [BB-4994](https://tasks.opencraft.com/browse/BB-4994) | https://github.com/openedx/edx-platform/pull/29106 | ✅ | Only in master branch. |
| openedx/edx-search@ad9cee4a3504262e7c41d3a7e4c10b1f615d6cf6 | [BB-5589](https://tasks.opencraft.com/browse/BB-5589) | https://github.com/openedx/edx-search/pull/123 | ✅ | We have bumped `edx-search` to `3.4.0`. |
| openedx/edx-platform@2b39da69b96482976fedcf08bae16c1ebabae372 | [BB-5258](https://tasks.opencraft.com/browse/BB-5258) | ⌛ https://github.com/openedx/edx-platform/pull/29728 | ✅ | |