Skip to content

Commit a3c2af0

Browse files
author
Avatarsia
committed
ci: add four upstream bug-fix branches to manifest
All four are single-file Avatarsia-authored bug fixes that are also open upstream PRs on openxe-org: - fix/250-wiedervorlage-sidebar-counter (PR OpenXE-org#253) www/eproosystem.php +2/-2: reactivate Wiedervorlagen counter - fix/dateien-stichwoerter-245 (PR OpenXE-org#246) classes/Modules/Api/Controller/Version1/FileController.php +2/-2: fix variable scoping in POST /v1/dateien stichwoerter - fix/versandpakete-247 (PR OpenXE-org#248) classes/Modules/Api/Controller/Version1/TrackingNumberController.php +25: write tracking numbers into the versandpakete table so the UI shows them - fix/player-custom-module-support (PR OpenXE-org#256) phpwf/class.player.php +12/-2: support _custom.php extension files for page controllers, analogous to class.erpapi_custom.php Each branch is based on an older origin/master snapshot, but since origin/master is strictly behind upstream/master (zero divergent commits), git merges only the new commits during integration without re-applying the upstream drift.
1 parent bdc93b3 commit a3c2af0

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

.github/integration-branches.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,9 @@ feature/row-highlight-clean
3838
fix/woocommerce-variation-support
3939
feature/paid-marking-clean
4040
mwst_korrektion
41+
42+
# Upstream bug-fix PRs (single-file patches, also live as open PRs on openxe-org)
43+
fix/250-wiedervorlage-sidebar-counter
44+
fix/dateien-stichwoerter-245
45+
fix/versandpakete-247
46+
fix/player-custom-module-support

0 commit comments

Comments
 (0)