2. H5P
3. Changes

Repository rebased

Original revision: 1f3048fee9cbc828029c590c2580db59fa4f88a5
New revision: 9406a4f16af671cef8894d145f7fd6be80f2570e 2 months ago

GitHub: https://github.com/otacke/h5p-bingo, master 2 months ago

Fixing an alert automatically unlocked the component. 2 months ago

Repository rebased

Original revision: 4b45f2b26dc08bff975d55de23a29290f3f50222
New revision: c2ff34b982f28e4136b50741f69d58b1d0c277b2 2 months ago

GitHub: https://github.com/otacke/h5p-ar-scavenger, master 2 months ago

Rebasing (1/2)
Auto-merging src/scripts/h5p-agamotto.js
CONFLICT (content): Merge conflict in src/scripts/h5p-agamotto.js
error: could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
 (1)

2 months ago

GitHub: https://github.com/otacke/h5p-agamotto, master 2 months ago

Repository rebased

Original revision: b889838585bf8ce26f3f15f80ce7f778dfceeacb
New revision: defed23245459d1f9c56737f710911122dbf3219 2 months ago

GitHub: https://github.com/otacke/h5p-advent-calendar, master 2 months ago

Repository rebased

Original revision: 97d11cb3e891a8af275e3179576cc486f68ae36c
New revision: ecd9c75dbf2757abadf6306c6e480c16a2c61fb0 2 months ago

GitHub: https://github.com/NDLANO/h5p-editor-ndla-timeline, master 2 months ago

Component seems unused. 2 months ago

Rebasing (1/2)
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
error: could not apply 0c23e55... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk.
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 0c23e55... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk.
 (1)

3 months ago

GitHub: https://github.com/otacke/h5p-sort-paragraphs, master 3 months ago

The component was automatically locked because of an alert. 3 months ago

Could not merge the repository. 3 months ago

Rebasing (1/2)
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
error: could not apply 0c23e55... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk.
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 0c23e55... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk.
 (1)

3 months ago

GitHub: https://github.com/otacke/h5p-sort-paragraphs, master 3 months ago

Repository rebased

Original revision: 7f28f730d392520587336dc5d4cfb813cda096e6
New revision: cf410587e91cfd4a9571e99fc054de039c7ce6b7 3 months ago

GitHub: https://github.com/NDLANO/h5p-topic-map, master 3 months ago