Simon-Initiative / oli-torus

61%

master: 62%

LAST BUILD ON BRANCH fix-conflicts

branch: fix-conflicts

CHANGE BRANCH

x

Reset

Sync Branches

• fix-conflicts
• KTH-image-coding
• KTH-tables
• MER-4768-add-test-coverage-reporting-to-ci-pipeline
• activity-cancel
• activity-ingest
• activity-scope
• activity-tests-fixed
• adaptive-activity-impl
• adaptive-refinements
• add-guest-flag-to-user
• add-image-by-url
• advanced-mode-stubs
• api-docs
• author-invite
• auto-format
• auto-format-elixir
• browserslist-warning
• cancel-delete
• cata
• cd-build-every-release
• cd-changes
• change-images
• changelog
• client-side-eval
• clone-project
• configure-section-roles
• cookie-preferences
• cookie-script-twice-bug
• create-registrations-from-json
• create-section-multiple-clicks
• delete-media-hotkey
• dependabot/npm_and_yarn/assets/elliptic-6.5.4
• dependabot/npm_and_yarn/assets/immer-8.0.1
• dependabot/npm_and_yarn/assets/ini-1.3.8
• dependabot/npm_and_yarn/assets/y18n-4.0.1
• disable-openapi-prod
• edit-page-after-publish
• editor-enhancements-restore-preview
• editor-paste-crashes
• editor-sequential
• eliminate-user-inst-fkey
• enable-ecto-repository-stats
• external-lti-lib
• extrinsic-user-state
• feature/parts-components
• filter-stale-locks
• finalize-changelog-0.6.0
• fix-broken-link
• fix-cata
• fix-cata-delivery
• fix-changelog
• fix-codeblock-overflow
• fix-deploy
• fix-deployment
• fix-docs
• fix-image-rendering
• fix-migration-issue
• fix-question-submission-browser
• fix-rixh-text-editor-styles
• fix-slack-send-with-no-url
• fix-table-apost
• fix-tests
• fix-type-readme
• fix-workspace-cookie-prefs
• freshdesk-api-bug
• freshdesk-tickets
• full-grade-sync
• full-timezone-support
• gettext
• grade-services
• handle-missing-objectives
• help-freshdesk-fix
• help-logo-bug
• hierarchy-delivery
• hotfix-revert-to-context-id-section-lookup
• html-escape
• http-unit-tests
• image-code-editor2
• image-coding-fixes
• img-caption-disable-html
• improve-lti-workflow
• ingest-ids
• insert-location
• issue-templates
• janus-v01
• lti-platform
• lti_params-missing
• master
• migrate-to-pow
• migrate-user-accounts
• new-auto-format
• objective-break-down
• objectives-service
• open-and-free
• open-external-of-url-in-new-tab
• openapi-for-all
• ordering
• preview-delivery-cleanup
• preview-feedback
• project-duplication-analytics
• project-slug-fix
• project-sorting
• project-visibility
• qa-fixes
• reenable-warnings-as-errors
• register-crash-existing-user
• release-0-5-0
• release-0.5.1
• remove-help-link-in-preview
• remove-unused-countries
• rendering-robustness
• research-consent
• resource-attempt-state
• review-mode
• revision-history
• rewire-links
• s3-deployments
• safari-contenteditable
• scope-lock-messages
• server-slugs
• slug-alphanumeric-fix
• slug-migration
• sticky-warning
• storage-service
• test
• unique-section-slug
• unit-tests
• unlink-section
• update-changelog
• update-changelog-0.3.0
• update-changelog-and-version-0.7.1
• update-docker-dev
• update-setup-instructions
• update-version
• update-version-0.2.0
• updated-readme
• upversion-0.8.0
• use-existing-institution
• use-kid-from-lti-request
• use-pinned-revision
• use-section-slug
• user-state-refinements
• version-0.4.0
• version-uptick-0.7.0