Commit 8ff4e14
committed
Merge remote-tracking branch 'nrk/release52' into bbc-release52
# Conflicts:
# meteor/package.json
# meteor/yarn.lock
# packages/blueprints-integration/src/documents/piece.ts
# packages/job-worker/src/blueprints/context/lib.ts
# packages/meteor-lib/package.json
# packages/mos-gateway/package.json
# packages/shared-lib/package.json
# packages/webui/package.json
# packages/webui/src/client/ui/FloatingInspectors/VTFloatingInspector.tsx
# packages/webui/src/client/ui/RundownView.tsx
# packages/webui/src/client/ui/SegmentTimeline/SegmentContextMenu.tsx
# packages/webui/src/client/ui/SegmentTimeline/SourceLayerItem.tsx
# packages/yarn.lockFile tree
139 files changed
+1174
-143
lines changed- meteor
- server
- api/rest/v1
- lib/rest/v1
- packages
- blueprints-integration
- documentation
- static/img
- docs
- for-developers
- getting-started
- installation
- installing-a-gateway/rundown-or-newsroom-system-connection
- installing-connections-and-additional-hardware
- main
- features
- tmp/images/icons
- job-worker/src
- ingest
- playout
- model/implementation
- live-status-gateway/src
- meteor-lib
- mos-gateway
- openapi/api/definitions
- playout-gateway
- src
- server-core-integration
- webui
- public
- icons
- images
- src/client
- styles
- shelf
- ui
- FloatingInspectors
- SegmentTimeline
- Parts
- Settings/Studio
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
139 files changed
+1174
-143
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
| 43 | + | |
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
275 | 275 | | |
276 | 276 | | |
277 | 277 | | |
278 | | - | |
| 278 | + | |
| 279 | + | |
279 | 280 | | |
280 | 281 | | |
281 | 282 | | |
| |||
291 | 292 | | |
292 | 293 | | |
293 | 294 | | |
| 295 | + | |
294 | 296 | | |
295 | 297 | | |
296 | 298 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
109 | 109 | | |
110 | 110 | | |
111 | 111 | | |
| 112 | + | |
112 | 113 | | |
113 | 114 | | |
114 | 115 | | |
115 | 116 | | |
116 | 117 | | |
117 | | - | |
| 118 | + | |
| 119 | + | |
118 | 120 | | |
119 | 121 | | |
120 | 122 | | |
| |||
0 commit comments