-
Anton authored
# Conflicts: # package-lock.json # src/components/mosys-old/partials/CellEditor.vue # src/components/mosys-old/partials/GridDisplay.vue # src/components/mosys-old/partials/GridEditor.vue # src/components/mosys-old/partials/GridEditorDefaultSource.vue # src/components/mosys-old/partials/GridEditorMagicSource.vue # src/components/mosys-old/partials/GridEditorSourcePieceMaker.vue # src/components/mosys-old/partials/GridEditorSourceVimeo.vue # src/components/mosys-old/partials/GridEditorSourceYouTube.vue # src/components/mosys-old/partials/GridEditorSources.vue # src/components/mosys-old/partials/cells/Cell2DGrid.vue # src/components/mosys-old/partials/cells/CellAnnotationList.vue # src/components/mosys-old/partials/cells/CellHtml.vue # src/components/mosys-old/partials/cells/CellIFrame.vue # src/components/mosys-old/partials/cells/CellImage.vue # src/components/mosys-old/partials/cells/CellInternalLink.vue # src/components/mosys-old/partials/cells/CellRecording.vue # src/components/mosys-old/partials/cells/CellText.vue # src/components/mosys-old/partials/cells/CellTimeline.vue # src/components/mosys-old/partials/cells/CellTitle.vue # src/components/mosys-old/partials/cells/CellUIFeedback.vue # src/components/mosys-old/partials/cells/CellVideo.vue # src/components/mosys-old/partials/cells/CellVimeo.vue # src/components/mosys-old/partials/cells/CellVisualization.vue # src/components/mosys-old/partials/index.js # src/components/shared-old/forms/Calendar.vue # src/components/shared-old/forms/CalendarTimeMain.vue # src/components/shared-old/forms/CancelButton.vue # src/components/shared-old/forms/FormAdd.vue # src/components/shared-old/forms/FormMain.vue # src/components/shared-old/forms/FormRow.vue # src/components/shared-old/forms/FormRowCheckbox.vue # src/components/shared-old/forms/SliderTime.vue # src/components/shared-old/forms/SliderTimeRow.vue # src/components/shared-old/forms/SubmitButton.vue # src/components/shared-old/forms/Tagging.vue # src/components/shared-old/forms/autocomplete.json # src/components/shared-old/forms/index.js # src/components/shared-old/partials/AccessControl.vue # src/components/shared-old/partials/Annotation.vue # src/components/shared-old/partials/Avatar.vue # src/components/shared-old/partials/BrowserWarning.vue # src/components/shared-old/partials/ContentBar.vue # src/components/shared-old/partials/CurrentUser.vue # src/components/shared-old/partials/Modal.vue # src/components/shared-old/partials/ModalConfirm.vue # src/components/shared-old/partials/Tags.vue # src/components/shared-old/partials/UserNav.vue # src/components/shared-old/partials/UserRights.vue # src/components/shared-old/partials/UsersTable.vue # src/components/shared-old/partials/VideoPlayerNew.vue # src/components/shared-old/partials/index.js # src/pages/mosys/grids/annotate.vue # src/store/index.js
d40f921d