User avatar None

Repository notification received

  1. H5P
  2. h5p-crossword
GitHub: https://github.com/otacke/h5p-crossword, master 4 months ago
User avatar None

Repository rebased

  1. H5P
  2. h5p-crossword
Repository rebased

Original revision: 28d0f2ee0075a187393434a19a07b2285a754af0
New revision: c8e70c3408e322d88a4f6da1b158240a19890c08 4 months ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-crossword
GitHub: https://github.com/otacke/h5p-crossword, master 4 months ago
User avatar None

Repository rebased

  1. H5P
  2. h5p-crossword
Repository rebased

Original revision: 9acc0e5c5a741a2723e1919d0803523f4b986b6c
New revision: 28d0f2ee0075a187393434a19a07b2285a754af0 4 months ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-crossword
GitHub: https://github.com/otacke/h5p-crossword, master 4 months ago
User avatar None

Repository rebase failed

  1. H5P
  2. h5p-ndla-virtual-tour
 
Rebasing (1/6)
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/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/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
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)
5 months ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-ndla-virtual-tour
GitHub: https://github.com/NDLANO/h5p-ndla-virtual-tour, master 5 months ago
User avatar None

Repository rebased

  1. H5P
  2. h5p-vocabulary-drill
Repository rebased

Original revision: dcd1b14d890257b04b0086071da5eaacc38c9043
New revision: f0fceef00d73910cf5e51453ddedd6a832923418 5 months ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-vocabulary-drill
GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, master 5 months ago
User avatar None

Alert triggered

  1. H5P
  2. h5p-video
Repository outdated. 5 months ago
User avatar None

Repository rebase failed

  1. H5P
  2. h5p-game-map
 
Rebasing (1/2)
Auto-merging language/nl.json
CONFLICT (add/add): Merge conflict in language/nl.json
error: could not apply 9d55fbc... Update translation files
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 9d55fbc... Update translation files
 (1)
5 months ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-game-map
GitHub: https://github.com/otacke/h5p-game-map, master 5 months ago
User avatar None

Repository rebase failed

  1. H5P
  2. h5p-game-map
 
Rebasing (1/2)
Auto-merging language/nl.json
CONFLICT (add/add): Merge conflict in language/nl.json
error: could not apply 9d55fbc... Update translation files
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 9d55fbc... Update translation files
 (1)
5 months ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-game-map
GitHub: https://github.com/otacke/h5p-game-map, master 5 months ago
User avatar None

Resource updated

  1. H5P
  2. h5p-dictation
  3. Basque
The “language/eu.json” file was changed. 5 months ago
User avatar None

Repository rebased

  1. H5P
  2. h5p-dictation
Repository rebased

Original revision: a7ea5aac0725193cad46ac567702b051e50600ca
New revision: 18b1e158e282cb39f536005f8ac12c802d1f6631 5 months ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-dictation
GitHub: https://github.com/otacke/h5p-dictation, master 5 months ago
User avatar None

Changes committed

  1. H5P
  2. h5p-dictation
  3. Chinese (PRC) (zh-cn)
Changes committed 5 months ago
User avatar addon:prefill

Automatically translated

  1. H5P
  2. h5p-dictation
  3. Chinese (PRC) (zh-cn)
forward slash
forward slash
5 months ago
User avatar addon:prefill

Automatically translated

  1. H5P
  2. h5p-dictation
  3. Chinese (PRC) (zh-cn)
Forward slash
Forward slash
5 months ago

Search