Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deployment #4134

Merged
merged 246 commits into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
246 commits
Select commit Hold shift + click to select a range
d33ab88
refactor(editor): WIP - use pluginMenu
hejtful Sep 19, 2024
f6479d0
refactor(editor): fix exercises initial state
hejtful Sep 19, 2024
1609c27
refactor(editor): revert type change to fix checks
elbotho Sep 19, 2024
b314b9e
fix(editor): update check for interactive exercises
elbotho Sep 19, 2024
96450da
refactor(editor): support en locale again
elbotho Sep 19, 2024
3d6fc05
refactor(editor): replace createOption, hack icons
elbotho Sep 19, 2024
c12aba2
fix(editor): make exercise interactive selection wrap
elbotho Sep 19, 2024
83987b3
refactor(editor): make icon mandatory
elbotho Sep 19, 2024
01bb1b8
refactor(editor): reuse existing type in plugin menu items export
elbotho Sep 19, 2024
4f9a788
Merge branch 'staging' into refactor/PE-148-plugins-and-plugin-menu
elbotho Sep 19, 2024
ce2e23c
refactor(editor): remove extra drag and drop blanks plugin
elbotho Sep 19, 2024
4e9db5f
fix(editor): restore checkIsAllowedNesting check
elbotho Sep 19, 2024
687bd5f
refactor(editor): filter pages plugin via checkIsAllowedNesting
elbotho Sep 19, 2024
4e79264
refactor(editor): make sure plugins from serlo.org create-plugins are…
elbotho Sep 19, 2024
e883321
refactor(editor): add filter to plugin-menu and some refactoring/rena…
elbotho Sep 19, 2024
3df464b
fix(editor): allow exercises in editor-preview
elbotho Sep 19, 2024
69b7ca8
feat(exercise): always show exercise UI when exercise or children are…
elbotho Sep 19, 2024
9895b18
refactor(exercise): simplify focus a bit
elbotho Sep 19, 2024
092c1de
refactor(exercise): move preview buttons to exercise toolbar
elbotho Sep 19, 2024
d0dff1e
Revert "refactor(exercise): move preview buttons to exercise toolbar"
elbotho Sep 19, 2024
ad965c2
refactor(exercise): move preview buttons to exercise toolbar
elbotho Sep 19, 2024
f2d2f7f
chore(e2e): adapt blanks test
elbotho Sep 19, 2024
c31b018
cleanup
elbotho Sep 19, 2024
18f907e
Merge pull request #4127 from serlo/move-preview-button-to-parent
elbotho Sep 20, 2024
ce6539a
refactor(editor): provide editorStrings to get plugin menu
elbotho Sep 20, 2024
97755ac
feat(e2e): add barebones add taxonomy test
elbotho Sep 20, 2024
8d8f239
Merge pull request #4133 from serlo/production
elbotho Sep 20, 2024
9e8df93
refactor(serlo): Delete a bunch of exercise generation code
Sep 20, 2024
a8fb389
refactor(serlo): Delete more code
Sep 20, 2024
3182bca
Merge pull request #4132 from serlo/e2e-add-barebones-taxonomy-add-test
elbotho Sep 20, 2024
14e7a70
refactor(serlo): Delete i18n strings
Sep 20, 2024
fd321a8
refactor(serlo): remove helper
elbotho Sep 20, 2024
a0d5097
Merge pull request #4135 from serlo/refactor/remove-exercise-generati…
elbotho Sep 20, 2024
7a4c832
New translations index.ts (German)
kulla Sep 20, 2024
bd5fdbd
New translations index.ts (French)
kulla Sep 20, 2024
affccfa
New translations index.ts (Spanish)
kulla Sep 20, 2024
d7114ac
New translations index.ts (Tamil)
kulla Sep 20, 2024
f1dfdd5
New translations index.ts (Hindi)
kulla Sep 20, 2024
61dd02c
refactor(exercise): remove i18n strings (again)
elbotho Sep 20, 2024
5dadc2b
Update source file index.ts
kulla Sep 20, 2024
65f686b
New translations index.ts (German)
kulla Sep 20, 2024
21b5a95
New translations index.ts (French)
kulla Sep 20, 2024
31573a1
New translations index.ts (Spanish)
kulla Sep 20, 2024
92f528a
New translations index.ts (Tamil)
kulla Sep 20, 2024
0feddb8
New translations index.ts (Hindi)
kulla Sep 20, 2024
228a7e2
Update source file index.ts
kulla Sep 20, 2024
dc6eb5a
Merge pull request #4136 from serlo/staging-translated
elbotho Sep 20, 2024
c0b75f4
refactor(exercise): unwrap initialState for exercise selection
elbotho Sep 20, 2024
44f6b36
fix(image): fix i18n string
elbotho Sep 22, 2024
bd292a8
New translations index.ts (German)
kulla Sep 22, 2024
e25f678
New translations index.ts (French)
kulla Sep 22, 2024
91e8e5a
New translations index.ts (Spanish)
kulla Sep 22, 2024
0de8803
New translations index.ts (Tamil)
kulla Sep 22, 2024
d4df48c
New translations index.ts (Hindi)
kulla Sep 22, 2024
3e8bf0b
Update source file index.ts
kulla Sep 22, 2024
c26b143
Merge pull request #4137 from serlo/staging-translated
elbotho Sep 23, 2024
39d1492
fix(plugin-exercise): selecting plugins with predefined state
hejtful Sep 23, 2024
e3e748f
refactor(editor): replace PluginMenuItemType
elbotho Sep 23, 2024
b1d7a86
chore(editor): cleanup imports
elbotho Sep 23, 2024
751ee4a
Merge pull request #4138 from serlo/refactor/remove-pluginMenuItemType
hejtful Sep 23, 2024
2dcf947
Merge pull request #4123 from serlo/refactor/PE-148-plugins-and-plugi…
elbotho Sep 23, 2024
9ab174b
New translations index.ts (German)
kulla Sep 23, 2024
85e6af6
New translations index.ts (French)
kulla Sep 23, 2024
b5c9965
New translations index.ts (Spanish)
kulla Sep 23, 2024
e20eabf
New translations index.ts (Tamil)
kulla Sep 23, 2024
afc8ccf
New translations index.ts (Hindi)
kulla Sep 23, 2024
f2160b9
refactor(blanks-drag-and-drop): remove plugin
elbotho Sep 23, 2024
2fc1a5c
Update source file index.ts
kulla Sep 23, 2024
1157c98
New translations index.ts (German)
kulla Sep 23, 2024
3e19385
Merge pull request #4139 from serlo/staging-translated
elbotho Sep 23, 2024
432d803
feat(sc-mc-exercise): own icon for each mode
elbotho Sep 23, 2024
ffabebe
Merge pull request #4140 from serlo/refactor/remove-BlanksExerciseDra…
elbotho Sep 23, 2024
9b93ec2
Update source file index.ts
kulla Sep 23, 2024
a331ddb
New translations index.ts (German)
kulla Sep 23, 2024
937c107
New translations index.ts (French)
kulla Sep 23, 2024
e6daa63
New translations index.ts (Spanish)
kulla Sep 23, 2024
790a6e7
New translations index.ts (Tamil)
kulla Sep 23, 2024
543038a
New translations index.ts (Hindi)
kulla Sep 23, 2024
54fc9db
Merge pull request #4141 from serlo/staging-translated
elbotho Sep 23, 2024
afd56fc
New translations index.ts (German)
kulla Sep 23, 2024
5a8e7f4
New translations index.ts (French)
kulla Sep 23, 2024
7c689bb
New translations index.ts (Spanish)
kulla Sep 23, 2024
a30e2b9
New translations index.ts (Tamil)
kulla Sep 23, 2024
d438717
New translations index.ts (Hindi)
kulla Sep 23, 2024
c175830
Merge branch 'staging' into pe-166-parent-toolbar-should-always-be-vi…
elbotho Sep 24, 2024
6b177f9
chore(deps): bump rollup from 4.21.3 to 4.22.4
dependabot[bot] Sep 24, 2024
2bae164
Merge pull request #4144 from serlo/dependabot/npm_and_yarn/rollup-4.…
elbotho Sep 24, 2024
0ad21f3
chore(exercise): repair after merge
elbotho Sep 24, 2024
22058f3
refactor(exercise): move preview button to exercise
elbotho Sep 24, 2024
aaaf86c
refactor(exercise): minor changes in toolbar
elbotho Sep 24, 2024
a490bdb
refactor(dropzone-image): make SelectionCard component, normalize sty…
elbotho Sep 24, 2024
526c28d
feat(blanks): add initial selection menu for table/text
elbotho Sep 24, 2024
6fae80b
refactor(exercise): portal interactive toolbar buttons to exercise to…
elbotho Sep 24, 2024
e23c928
Merge pull request #4126 from serlo/pe-166-parent-toolbar-should-alwa…
elbotho Sep 24, 2024
674779a
Merge branch 'staging' into feat/fill-in-the-blanks-initial-ui
elbotho Sep 24, 2024
0eff590
New translations index.ts (German)
kulla Sep 24, 2024
295d68e
New translations index.ts (French)
kulla Sep 24, 2024
90189b0
New translations index.ts (Spanish)
kulla Sep 24, 2024
08613ea
New translations index.ts (Tamil)
kulla Sep 24, 2024
f416ae5
New translations index.ts (Hindi)
kulla Sep 24, 2024
ce68692
fix(exercise): child toolbars now not overlapping exercise context menu
elbotho Sep 24, 2024
9645e8c
Merge pull request #4143 from serlo/staging-translated
elbotho Sep 24, 2024
88fbb52
refactor(exercise): remove interactive select, add context menu butto…
elbotho Sep 24, 2024
2d8064e
refactor(exercise): move all strings to plugin strings
elbotho Sep 24, 2024
7303bd2
refactor(exercise): move exercise menu item unwrap to selection compo…
elbotho Sep 24, 2024
554a9fc
fix(exercise): make sure toolbar content rerenders when interactive c…
elbotho Sep 24, 2024
775aecf
Merge pull request #4147 from serlo/pe-172-remove-exercise-interactiv…
elbotho Sep 24, 2024
515a6eb
Merge branch 'staging' into pe-167-move-exercise-specific-settings-in…
elbotho Sep 24, 2024
811888d
Merge pull request #4145 from serlo/feat/fill-in-the-blanks-initial-ui
elbotho Sep 24, 2024
7b99e2f
Merge branch 'staging' into pe-167-move-exercise-specific-settings-in…
elbotho Sep 24, 2024
15c2b0b
New translations index.ts (German)
kulla Sep 24, 2024
bf99306
New translations index.ts (French)
kulla Sep 24, 2024
627bb89
New translations index.ts (Spanish)
kulla Sep 24, 2024
25e2928
New translations index.ts (Tamil)
kulla Sep 24, 2024
c31f00d
New translations index.ts (Hindi)
kulla Sep 24, 2024
abbc93e
Update source file index.ts
kulla Sep 24, 2024
ca8e01f
fix(e2e): adapt tests to new ui
elbotho Sep 24, 2024
67792d0
New translations index.ts (German)
kulla Sep 24, 2024
3cb88ca
Merge pull request #4148 from serlo/staging-translated
elbotho Sep 24, 2024
1b759e7
Merge pull request #4146 from serlo/pe-167-move-exercise-specific-set…
hejtful Sep 25, 2024
2ed60c3
New translations index.ts (German)
kulla Sep 25, 2024
63c5ba1
New translations index.ts (French)
kulla Sep 25, 2024
a32536d
New translations index.ts (Spanish)
kulla Sep 25, 2024
9a188f0
New translations index.ts (Tamil)
kulla Sep 25, 2024
cc4dcb5
New translations index.ts (Hindi)
kulla Sep 25, 2024
13c53bc
Merge pull request #4149 from serlo/staging-translated
hejtful Sep 25, 2024
6ef0aad
fix(editor-web-component): Make build determinsitic and agnostic of c…
Sep 25, 2024
a4b7f5a
fix(exercise): excessive vertical white space
hejtful Sep 25, 2024
ad8176a
Merge pull request #4150 from serlo/fix/make-editor-web-component-bui…
CodingDive Sep 25, 2024
3563098
Merge pull request #4151 from serlo/fix/exercise-excessive-vertical-s…
hejtful Sep 25, 2024
771a5ec
refactor(editor): remove custom fields for edusharing asset plugin
elbotho Sep 27, 2024
7f07af5
refactor(editor): duplicate some serlo components, replace many of th…
elbotho Sep 27, 2024
cdb7d91
refactor(editor): only import from @serlo/frontend (not @/*)
elbotho Sep 27, 2024
17ab2f7
refactor(editor): move edit mode strings to new editor string provider
elbotho Sep 27, 2024
a0caeee
refactor(editor): move i18n strings for static renderer to editor
elbotho Sep 27, 2024
b7fd665
refactor(frontend): move editor string provider to frontend client base
elbotho Sep 27, 2024
73d181a
Revert "refactor(frontend): move editor string provider to frontend c…
elbotho Sep 27, 2024
32c557c
refactor(frontend): move i18n provider, use new editor renderer compo…
elbotho Sep 28, 2024
e32ea3b
chore(editor): update german static strings with old strings
elbotho Sep 28, 2024
7ca55d0
chore(editor): translate german edit strings with old strings
elbotho Sep 28, 2024
4dda224
fix(editor): filter plugin menu by support
elbotho Sep 28, 2024
81ad19a
refactor(editor): cleanup editor wrappers
elbotho Sep 28, 2024
0ab6838
refactor(editor): move localstorage code into editor
elbotho Sep 28, 2024
b810d0c
chore(editor): fix dep cycle, cleanup
elbotho Sep 28, 2024
162440f
fix(editor): load some serlo specific comps lazily
elbotho Oct 2, 2024
1b8a2dc
Merge pull request #4156 from serlo/fix/filter-by-supported
elbotho Oct 2, 2024
9b3daee
fix import path
elbotho Oct 2, 2024
5bdfb78
refactor(editor): remove useLang, add language to i18n strings
elbotho Oct 2, 2024
4346c2b
refactor(editor): move all plugin menu utils to rows plugin
hejtful Oct 4, 2024
2eb9c23
Merge pull request #4158 from serlo/refactor/PE-148-move-plugin-menu-…
elbotho Oct 4, 2024
d940db0
Merge branch 'staging' into refactor/editor-imports
elbotho Oct 4, 2024
ce0731d
Merge branch 'refactor/editor-imports' into refactor/editor-i18n
elbotho Oct 4, 2024
856b979
fix after merge conflicts
elbotho Oct 4, 2024
a3adae9
Merge pull request #4155 from serlo/refactor/editor-i18n
elbotho Oct 4, 2024
6525a88
Merge pull request #4154 from serlo/refactor/editor-imports
elbotho Oct 6, 2024
0f010a9
New translations index.ts (German)
kulla Oct 6, 2024
80afd84
New translations index.ts (French)
kulla Oct 6, 2024
6e25bcd
New translations index.ts (Spanish)
kulla Oct 6, 2024
96fc7ed
New translations index.ts (Tamil)
kulla Oct 6, 2024
a4edb1e
New translations index.ts (Hindi)
kulla Oct 6, 2024
575dedd
Update source file index.ts
kulla Oct 6, 2024
306ecdc
New translations index.ts (German)
kulla Oct 6, 2024
442a7d7
Merge branch 'staging' into staging-translated
elbotho Oct 6, 2024
46143f1
Merge pull request #4159 from serlo/staging-translated
elbotho Oct 6, 2024
429a3d4
fix(dropzoneImage): Change title
elbotho Oct 7, 2024
52f512a
feat(exercise): add interactive title to toolbar
elbotho Oct 7, 2024
85d4ac1
eslint
elbotho Oct 7, 2024
ab3b228
Merge pull request #4160 from serlo/pe-184-pe-183
elbotho Oct 7, 2024
330dd1d
chore(e2e): update package in package.json
elbotho Oct 7, 2024
0fac93b
chore(e2e): yarn
elbotho Oct 7, 2024
3e71e04
fix(plugin-rows): lazy loading anchor link copy tool broke on first a…
elbotho Oct 8, 2024
8414ed3
refactor(plugin-rows): move some strings
elbotho Oct 8, 2024
a58daae
Merge pull request #4162 from serlo/fix-lazy-problem-copy-tool
elbotho Oct 8, 2024
1a11cad
Merge branch 'staging' into refactor/editor-ui
elbotho Oct 8, 2024
43e5a8b
fix(editor-integration): disable ssr for editor
elbotho Oct 8, 2024
64aa221
fix(editor-integration): also disable ssr on other routes
elbotho Oct 8, 2024
cce4f9d
fix(plugin-video): use staticStrings in renderer
elbotho Oct 8, 2024
3d8adb5
Merge pull request #4161 from serlo/e2e-upgrade-packages
elbotho Oct 8, 2024
acf7a62
refactor(plugin-rows): change anchor link copy to not import from fro…
elbotho Oct 8, 2024
faccb31
refactor(editor): duplicate radix NavigationMenu helpers in editor
elbotho Oct 8, 2024
eb00c60
refactor(plugin-article): use normal link instead of next link
elbotho Oct 8, 2024
3741233
refactor(edusharing-asset): remove next/image dependency
elbotho Oct 8, 2024
406359e
refactor(plugin-page-team): remove plugin, replace team pages with st…
elbotho Oct 8, 2024
dd3ccb5
Merge pull request #4157 from serlo/refactor/editor-ui
elbotho Oct 8, 2024
2a5b1f4
chore(editor-releases): Add changesets and version releases to Github
Oct 8, 2024
1c0c3de
chore(editor): Bump version
Oct 8, 2024
8344a21
chore(editor): Add first changeset with breaking change
Oct 8, 2024
1cdbee9
Merge branch 'staging' into refactor/remove-custom-fields-for-edusharing
elbotho Oct 8, 2024
bcd8f66
fixes after merge
elbotho Oct 8, 2024
4ef854c
Merge pull request #4153 from serlo/refactor/remove-custom-fields-for…
elbotho Oct 8, 2024
4db8f36
Merge branch 'staging' into chore/release-new-editor-version-and-chan…
Oct 8, 2024
a22b4f3
refactor(frontend): make vidis experiment a standalone cookie
elbotho Oct 8, 2024
b80755e
fix(editor-packages): Fix images in packages
Oct 8, 2024
2b42b73
Merge pull request #4164 from serlo/chore/release-new-editor-version-…
CodingDive Oct 8, 2024
44c8dd2
refactor(editor): refactor preference, persist to localStorage
elbotho Oct 8, 2024
0d6282c
chore(editor): Change Github action to open a PR Instead due to prote…
Oct 8, 2024
ed8ecd1
chore(editor): Add changeset
Oct 8, 2024
daf80fb
Merge pull request #4166 from serlo/ci/github-action-creates-pr-with-…
CodingDive Oct 8, 2024
15a59e5
ci(editor): Let changeset change the version
Oct 8, 2024
5801fab
Merge pull request #4167 from serlo/ci/apply-changesets
CodingDive Oct 8, 2024
b53ec72
refactor(editor): use preference for experiments, simplify frontend e…
elbotho Oct 8, 2024
ad2db63
fix(ci): Close if statements in bash
Oct 8, 2024
4de8cb9
Merge pull request #4168 from serlo/ci/close-if-conditional-in-ci
CodingDive Oct 8, 2024
49e50dc
ci(fix): Only publish new version after PR gets merged
Oct 8, 2024
2afc6f3
Merge pull request #4169 from serlo/ci/add-polling-to-merge-pr-within…
CodingDive Oct 8, 2024
f29661a
fix(editor-web-component): Re-export plugin menu (breaking change) an…
Oct 8, 2024
701d047
chore(editor-web-component): Update docs
Oct 8, 2024
85470d3
Merge pull request #4170 from serlo/chore/release-editor-web-componen…
CodingDive Oct 8, 2024
46fb167
Merge pull request #4165 from serlo/refactor/move-experiments-to-editor
elbotho Oct 9, 2024
94bcc00
fix(e2e): adapt math tests
elbotho Oct 9, 2024
ce12338
refactor(e2e): move editor loading to helper so we can add a wait for…
elbotho Oct 9, 2024
418a009
Merge pull request #4163 from serlo/refactor/team-page-plugin
elbotho Oct 9, 2024
dd5503e
fix(editor-math): add correct data-qa to mode switch
elbotho Oct 9, 2024
eb1e748
fix(e2e): make sure we set math mode before test
elbotho Oct 9, 2024
f9a6b91
fix(e2e): wait some time for quickbar data to load
elbotho Oct 9, 2024
39b7686
Merge pull request #4172 from serlo/e2e-adapt-math-tests
elbotho Oct 9, 2024
554827c
refactor(e2e): cleanup config a bit
elbotho Oct 9, 2024
cf65c69
fix(e2e): deactivate video test (let yt cooldown) and add wait for fl…
elbotho Oct 9, 2024
945dfb8
fix(e2e): correct formula string
elbotho Oct 9, 2024
d4e9559
fix(e2e): make test more reliably (wait for quickbar-data again)
elbotho Oct 9, 2024
bf2e090
Merge pull request #4173 from serlo/e2e-fix-more-test
elbotho Oct 9, 2024
e1d51e1
fix(e2e): add more waits
elbotho Oct 9, 2024
ff03df2
fix(editor-packages): Use one redux store per instance of editor
Oct 10, 2024
c2ea34b
refactor(store): Remove leftover
Oct 10, 2024
424eaf4
chore(editor): Release v0.15.4
Oct 10, 2024
960e9d7
Merge pull request #4175 from serlo/fix/one-store-per-editor-instance
CodingDive Oct 10, 2024
9f3b67e
chore(editor-web-component): Release v0.8.1
Oct 10, 2024
6b5eaca
ci(editor): Revert changes from last PR with changesets and throw out…
Oct 10, 2024
75f0958
Merge pull request #4176 from serlo/chore/remove-changelog-to-publish…
CodingDive Oct 10, 2024
4fb7205
Merge branch 'staging' into chore/release-editor-web-component-v0.8.1
Oct 10, 2024
7a94bed
fix(editor-web-component): Install new editor package
Oct 10, 2024
d707304
Merge pull request #4177 from serlo/chore/release-editor-web-componen…
CodingDive Oct 10, 2024
52d9ba7
refactor: remove leftover dev string
LarsTheGlidingSquirrel Oct 10, 2024
536df98
chore: use new endpoints for edusharing embeds
LarsTheGlidingSquirrel Oct 10, 2024
a86017d
fix(table-plugin): only show cell switch button when image plugin exists
LarsTheGlidingSquirrel Oct 10, 2024
31c9717
fix(plugin-menu): show icons when choosing exercise type in exercise …
LarsTheGlidingSquirrel Oct 10, 2024
e6aea53
fix(plugin-menu): add edusharing plugin to plugin menu
LarsTheGlidingSquirrel Oct 10, 2024
6cc52f4
fix(plugin-menu): only show exercise types when they are supported
LarsTheGlidingSquirrel Oct 10, 2024
8c2b7dc
fix: correct property `fill-opacity` in svgs
LarsTheGlidingSquirrel Oct 10, 2024
25041eb
chore(yarn): commit arm64 specific files
hejtful Oct 10, 2024
8ab73fe
Merge pull request #4179 from serlo/chore/commit-yarn-arm64-files
elbotho Oct 10, 2024
6180c60
fix(rows): check if interactive exercise plugins are supported in men…
elbotho Oct 10, 2024
f372059
Merge pull request #4180 from serlo/fix-bug-in-plugin-menu
LarsTheGlidingSquirrel Oct 11, 2024
b33ec50
fix(edusharing-plugin): add missing icon
LarsTheGlidingSquirrel Oct 11, 2024
31be71e
Merge pull request #4178 from serlo/make-editor-run-in-serlo-editor-a…
LarsTheGlidingSquirrel Oct 11, 2024
ef8c49e
fix(e2e): try to reduce flakyness
elbotho Oct 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions apps/web/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.env
4 changes: 2 additions & 2 deletions apps/web/src/components/auth/node.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import { FlowType } from './flow-type'
import { LoginButtonBildungsraum } from './login-button-bildungsraum'
import { LoginButtonVidis } from './login-button-vidis'
import { FaIcon } from '../fa-icon'
import { shouldUseFeature } from '../user/profile-experimental'
import { Message, getKratosMessageString } from '@/components/auth/message'
import { useInstanceData } from '@/contexts/instance-context'
import { cn } from '@/helper/cn'
import { isProduction } from '@/helper/is-production'
import { triggerSentry } from '@/helper/trigger-sentry'
import { isVidisActive } from '@/pages/auth/___activate_vidis'

export interface NodeProps {
node: UiNode
Expand Down Expand Up @@ -109,7 +109,7 @@ export function Node({
)
}
if (
(!isProduction || shouldUseFeature('authVidis')) &&
(!isProduction || isVidisActive()) &&
attributes.name === 'provider' &&
attributes.value === 'vidis'
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { StaticRenderer } from '@editor/static-renderer/static-renderer'
import { EditorPluginType } from '@editor/types/editor-plugin-type'
import { type ReactNode } from 'react'

Expand All @@ -11,6 +10,7 @@ import {
import { useInstanceData } from '@/contexts/instance-context'
import { type RevisionData, UuidRevType } from '@/data-types'
import { cn } from '@/helper/cn'
import { EditorRenderer } from '@/serlo-editor-integration/editor-renderer'
import { GeogebraSerloStaticRenderer } from '@/serlo-editor-integration/serlo-plugin-wrappers/geogebra-serlo-static-renderer'
import { VideoSerloStaticRenderer } from '@/serlo-editor-integration/serlo-plugin-wrappers/video-serlo-static-renderer'

Expand Down Expand Up @@ -52,7 +52,7 @@ export function RevisionPreviewBoxes({
diffMode={DiffViewerMode.content}
changes={dataSet.content !== data.currentRevision.content}
>
<StaticRenderer document={dataSet.content} />
<EditorRenderer document={dataSet.content} />
</PreviewBox>
)}
{renderVideoOrAppletBox(dataSet)}
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/components/author/uuid-url-input.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { useEditStrings } from '@editor/i18n/edit-strings-provider'
import { gql } from 'graphql-request'
import { useState } from 'react'

import { FaIcon } from '../fa-icon'
import { useGraphqlSwr } from '@/api/use-graphql-swr'
import { useInstanceData } from '@/contexts/instance-context'
import { useEditorStrings } from '@/contexts/logged-in-data-context'
import { UuidType, UuidWithRevType } from '@/data-types'
import {
TaxonomyTermType,
Expand Down Expand Up @@ -38,7 +38,7 @@ export function UuidUrlInput({
const { data, error } = useSimpleUuidFetch(maybeUuid)

const { strings } = useInstanceData()
const modalStrings = useEditorStrings().templatePlugins.article.addModal
const modalStrings = useEditStrings().templatePlugins.article.addModal

return (
<div className="my-4 border-t-2 pt-5">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export function ExerciseLicenseNotice({
// Both default, don't display
if (exerciseLicense.isDefault && solutionLicense.isDefault) return null

const { task } = strings.content.exercises
const { task } = strings.content
const { solution } = strings.entities

// Task special, solution default: Display with "Aufgabenstellung"
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/content/license/license-notice.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export function LicenseNotice({

function translateTypeString(): string {
if (type === 'task' || type === 'exercise-group')
return strings.content.exercises.task
return strings.content.task
return strings.entities[type || 'content']
}
}
6 changes: 3 additions & 3 deletions apps/web/src/components/entity/entity.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { editorRenderers } from '@editor/plugin/helpers/editor-renderer'
import { isEmptyArticle } from '@editor/plugins/article/utils/static-is-empty'
import { CourseHeader } from '@editor/plugins/course/renderer/course-header'
import { StaticRenderer } from '@editor/static-renderer/static-renderer'
import { EditorPluginType } from '@editor/types/editor-plugin-type'
import { isArticleDocument } from '@editor/types/plugin-type-guards'
import {
Expand All @@ -26,6 +25,7 @@ import { isProduction } from '@/helper/is-production'
import { replacePlaceholders } from '@/helper/replace-placeholders'
import { getHistoryUrl } from '@/helper/urls/get-history-url'
import { createRenderers } from '@/serlo-editor-integration/create-renderers'
import { EditorRenderer } from '@/serlo-editor-integration/editor-renderer'

export interface EntityProps {
data: EntityData
Expand Down Expand Up @@ -117,10 +117,10 @@ export function Entity({ data }: EntityProps) {
isInExerciseGroup: false,
}}
>
<StaticRenderer document={document} />
<EditorRenderer document={document} />
</ExerciseContext.Provider>
) : (
<StaticRenderer document={document} />
<EditorRenderer document={document} />
)

if (data.schemaData?.setContentAsSection) {
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading