vybohv
Translation approved |
|
vybohv
Translation approved |
|
vybohv
Translation approved |
|
vybohv
Translation approved |
|
vybohv
Translation approved |
|
vybohv
Translation approved |
|
vybohv
Translation approved |
|
vybohv
Translation changed |
|
None
Repository rebase failed |
Rebasing (1/6) CONFLICT (modify/delete): .storybook/main.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of .storybook/main.js left in tree. Auto-merging language/.en.json CONFLICT (content): Merge conflict in language/.en.json Auto-merging language/bg.json CONFLICT (content): Merge conflict in language/bg.json Auto-merging language/ca.json CONFLICT (content): Merge conflict in language/ca.json Auto-merging language/cs.json CONFLICT (content): Merge conflict in language/cs.json Auto-merging language/de.json CONFLICT (content): Merge conflict in language/de.json Auto-merging language/el.json CONFLICT (content): Merge conflict in language/el.json Auto-merging language/es-mx.json CONFLICT (content): Merge conflict in language/es-mx.json Auto-merging language/es.json CONFLICT (content): Merge conflict in language/es.json Auto-merging language/et.json CONFLICT (content): Merge conflict in language/et.json Auto-merging language/eu.json CONFLICT (content): Merge conflict in language/eu.json Auto-merging language/fi.json CONFLICT (content): Merge conflict in language/fi.json Auto-merging language/fr.json CONFLICT (content): Merge conflict in language/fr.json Auto-merging language/gl.json CONFLICT (content): Merge conflict in language/gl.json Auto-merging language/it.json CONFLICT (content): Merge conflict in language/it.json Auto-merging language/ko.json CONFLICT (content): Merge conflict in language/ko.json Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json Auto-merging language/nl.json CONFLICT (content): Merge conflict in language/nl.json Auto-merging language/nn.json CONFLICT (content): Merge conflict in language/nn.json Auto-merging language/pt-br.json CONFLICT (content): Merge conflict in language/pt-br.json Auto-merging language/sl.json CONFLICT (content): Merge conflict in language/sl.json Auto-merging language/sv.json CONFLICT (content): Merge conflict in language/sv.json Auto-merging package-lock.json CONFLICT (content): Merge conflict in package-lock.json Auto-merging package.json CONFLICT (content): Merge conflict in package.json Auto-merging scripts/components/Dialog/InteractionContent.js CONFLICT (content): Merge conflict in scripts/components/Dialog/InteractionContent.js Auto-merging scripts/components/Dialog/InteractionContent.scss CONFLICT (content): Merge conflict in scripts/components/Dialog/InteractionContent.scss Auto-merging scripts/components/HUD/Buttons/Button/Button.js CONFLICT (content): Merge conflict in scripts/components/HUD/Buttons/Button/Button.js Auto-merging scripts/components/Interactions/HotspotNavButton.js CONFLICT (content): Merge conflict in scripts/components/Interactions/HotspotNavButton.js Auto-merging scripts/components/Interactions/NavigationButton.js CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButton.js Auto-merging scripts/components/Interactions/NavigationButtonLabel.js CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButtonLabel.js Auto-merging scripts/components/Interactions/OpenContent.js CONFLICT (content): Merge conflict in scripts/components/Interactions/OpenContent.js Auto-merging scripts/components/Interactions/OpenContent.scss Auto-merging scripts/components/Main.js CONFLICT (content): Merge conflict in scripts/components/Main.js Auto-merging scripts/components/Scene/Scene.js CONFLICT (content): Merge conflict in scripts/components/Scene/Scene.js Auto-merging scripts/components/Scene/SceneTypes/StaticScene.js CONFLICT (content): Merge conflict in scripts/components/Scene/SceneTypes/StaticScene.js Auto-merging scripts/components/Scene/SceneTypes/ThreeSixtyScene.js Auto-merging scripts/utils/focus-trap.js Auto-merging scripts/utils/open-content-utils.js CONFLICT (modify/delete): scripts/utils/sanitization.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD. Version HEAD of scripts/utils/sanitization.js left in tree. Auto-merging scripts/utils/utils.js CONFLICT (content): Merge conflict in scripts/utils/utils.js Auto-merging semantics.json CONFLICT (content): Merge conflict in semantics.json CONFLICT (modify/delete): stories/static/h5p-content-type.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/h5p-content-type.js left in tree. CONFLICT (modify/delete): stories/static/h5p-x-api-event.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/h5p-x-api-event.js left in tree. CONFLICT (modify/delete): stories/static/h5p.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/h5p.js left in tree. CONFLICT (modify/delete): stories/static/joubelui.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/joubelui.js left in tree. CONFLICT (modify/delete): stories/static/questions.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/questions.js left in tree. CONFLICT (modify/delete): stories/static/singlechoiceset.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/singlechoiceset.js left in tree. CONFLICT (modify/delete): stories/static/summary.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/summary.js left in tree. CONFLICT (modify/delete): stories/static/three-sixty.js deleted in HEAD and modified in 31ece51 (Revert "Prepare for release"). Version 31ece51 (Revert "Prepare for release") of stories/static/three-sixty.js left in tree. error: could not apply 31ece51... Revert "Prepare for release" 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 31ece51... Revert "Prepare for release" (1)4 months ago |
None
Repository notification received |
GitHub: https://github.com/NDLANO/h5p-ndla-virtual-tour, master
4 months ago
|
None
Repository rebase failed |
warning: skipped previously applied commit 3242db8 warning: skipped previously applied commit b08bcb2 warning: skipped previously applied commit ac7dda3 warning: skipped previously applied commit ddba6ca hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/1) Auto-merging language/lt.json CONFLICT (add/add): Merge conflict in language/lt.json error: could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian 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 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk. (1)4 months ago |
None
Repository notification received |
GitHub: https://github.com/NDLANO/h5p-editor-ndla-virtual-tour, master
4 months ago
|
None
Repository rebased |
Repository rebased
Original revision: e3a07378a09ad37a824d7581b9b1bdbffc6d1beb New revision: 8df3880f117fcb7960f0a27f3b0f292430d410da 4 months ago |
None
Repository notification received |
GitHub: https://github.com/NDLANO/h5p-topic-map, master
4 months ago
|
None
Repository rebased |
Repository rebased
Original revision: f3b4a2b2a2af1505e959508b01d7f17d5e230722 New revision: 49f38b1137cb7d2dfa84e578e71ac1b51ea0ebab 4 months ago |
None
Repository notification received |
GitHub: https://github.com/NDLANO/h5p-editor-ndla-timeline, master
4 months ago
|
None
Repository rebased |
Repository rebased
Original revision: b2a767ef8738058bacdc3cd7bbb0c12809b6763f New revision: a96c009f971b67f8a29e09d06f2e2d3f3d18da6e 4 months ago |
None
Repository notification received |
GitHub: https://github.com/NDLANO/h5p-editor-topic-map, master
4 months ago
|
None
Repository rebased |
Repository rebased
Original revision: 4daf0a77f5f8937c6bee7c313fd64038f139ba53 New revision: e3a07378a09ad37a824d7581b9b1bdbffc6d1beb 4 months ago |
None
Repository notification received |
GitHub: https://github.com/NDLANO/h5p-topic-map, master
4 months ago
|
his option determines if the "Show Solution" button will be shown for all questions, disabled for all or configured for each question individuallyáto možnosť určuje, či sa tlačidlo „Zobraziť riešenie“ zobrazí pre všetky otázky, či bude pre všetky zakázané, alebo či bude nakonfigurované pre každú otázku jednotlivo.