Skip to content

Commit 8338eab

Browse files
committed
Merge branch 'upstream/release52' into bbc-release52
2 parents df01158 + b20b4a4 commit 8338eab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1500
-2160
lines changed

meteor/CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
### [1.51.5](///compare/v1.51.4...v1.51.5) (2025-01-07)
6+
7+
8+
### Bug Fixes
9+
10+
* **job-worker/playout:** Hold mode doesn't work at all a7d6999
11+
12+
### [1.51.4](///compare/v1.51.3...v1.51.4) (2024-12-04)
13+
14+
15+
### Bug Fixes
16+
17+
* Device Action Studio Context gets lost, Adlib previews are unstable 193815d
18+
* Live Status Gateway Dockerfile (regular) still uses yarn to start 0ae53c4
19+
* release scripts broken on Windows 9636051
20+
* RundownView shows spinner when unMOSing a Rundown from a Playlist 874e85c
21+
522
### [1.51.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.51.1...v1.51.2) (2024-11-21)
623

724

meteor/yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,7 @@ __metadata:
12401240
resolution: "@sofie-automation/shared-lib@portal:../packages/shared-lib::locator=automation-core%40workspace%3A."
12411241
dependencies:
12421242
"@mos-connection/model": v4.2.0
1243-
timeline-state-resolver-types: 9.2.0-nightly-release52-20240923-122840-58cfbb259.0
1243+
timeline-state-resolver-types: 9.2.0-nightly-release52-20241219-123204-90290cef1.0
12441244
tslib: ^2.6.2
12451245
type-fest: ^3.13.1
12461246
languageName: node
@@ -10167,12 +10167,12 @@ __metadata:
1016710167
languageName: node
1016810168
linkType: hard
1016910169

10170-
"timeline-state-resolver-types@npm:9.2.0-nightly-release52-20240923-122840-58cfbb259.0":
10171-
version: 9.2.0-nightly-release52-20240923-122840-58cfbb259.0
10172-
resolution: "timeline-state-resolver-types@npm:9.2.0-nightly-release52-20240923-122840-58cfbb259.0"
10170+
"timeline-state-resolver-types@npm:9.2.0-nightly-release52-20241219-123204-90290cef1.0":
10171+
version: 9.2.0-nightly-release52-20241219-123204-90290cef1.0
10172+
resolution: "timeline-state-resolver-types@npm:9.2.0-nightly-release52-20241219-123204-90290cef1.0"
1017310173
dependencies:
1017410174
tslib: ^2.6.3
10175-
checksum: c041363201bcfc0daac2ebca021b09fddc1f5b12fdeb932d9c19bfadc3ee308aa81f36c74c005edad2e756ed1c6465de779bfca5ed63ffd940878bf015497231
10175+
checksum: 3c7a6fa15aa6d7b16efe8bf18ac187064e54e3a1e9dc284280a39c0256e6104d356095ea67495c7a5a3c1e1f408ea86a86094dd19972ba3e161acc6b1eab38fa
1017610176
languageName: node
1017710177
linkType: hard
1017810178

packages/blueprints-integration/CHANGELOG.md

Lines changed: 7 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,116 +3,73 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6-
## [1.51.3](https://github.com/nrkno/sofie-core/compare/v1.51.2...v1.51.3) (2024-11-21)
6+
## [1.51.5](https://github.com/nrkno/sofie-core/compare/v1.51.4...v1.51.5) (2025-01-07)
77

88
**Note:** Version bump only for package @sofie-automation/blueprints-integration
99

10+
## [1.51.4](https://github.com/nrkno/sofie-core/compare/v1.51.3...v1.51.4) (2024-12-04)
1011

12+
**Note:** Version bump only for package @sofie-automation/blueprints-integration
1113

14+
## [1.51.3](https://github.com/nrkno/sofie-core/compare/v1.51.2...v1.51.3) (2024-11-21)
1215

16+
**Note:** Version bump only for package @sofie-automation/blueprints-integration
1317

1418
## [1.51.2](https://github.com/nrkno/sofie-core/compare/v1.51.1...v1.51.2) (2024-11-21)
1519

1620
**Note:** Version bump only for package @sofie-automation/blueprints-integration
1721

18-
19-
20-
21-
2222
## [1.51.1](https://github.com/nrkno/sofie-core/compare/v1.51.1-2...v1.51.1) (2024-11-13)
2323

2424
**Note:** Version bump only for package @sofie-automation/blueprints-integration
2525

26-
27-
28-
29-
3026
## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
3127

3228
**Note:** Version bump only for package @sofie-automation/blueprints-integration
3329

34-
35-
36-
37-
3830
## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
3931

4032
**Note:** Version bump only for package @sofie-automation/blueprints-integration
4133

42-
43-
44-
45-
4634
## [1.51.1-1](https://github.com/nrkno/sofie-core/compare/v1.51.1-0...v1.51.1-1) (2024-10-18)
4735

4836
**Note:** Version bump only for package @sofie-automation/blueprints-integration
4937

50-
51-
52-
53-
5438
## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
5539

5640
**Note:** Version bump only for package @sofie-automation/blueprints-integration
5741

58-
59-
60-
61-
6242
## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
6343

6444
**Note:** Version bump only for package @sofie-automation/blueprints-integration
6545

66-
67-
68-
69-
7046
# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
7147

7248
**Note:** Version bump only for package @sofie-automation/blueprints-integration
7349

74-
75-
76-
77-
7850
# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
7951

8052
**Note:** Version bump only for package @sofie-automation/blueprints-integration
8153

82-
83-
84-
85-
8654
# [1.51.0-in-testing.3](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.2...v1.51.0-in-testing.3) (2024-09-25)
8755

8856
**Note:** Version bump only for package @sofie-automation/blueprints-integration
8957

90-
91-
92-
93-
9458
# [1.51.0-in-testing.2](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.1...v1.51.0-in-testing.2) (2024-09-24)
9559

9660
**Note:** Version bump only for package @sofie-automation/blueprints-integration
9761

98-
99-
100-
101-
10262
# [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
10363

104-
10564
### Features
10665

107-
* stringify piece NoraContent payload SOFIE-3398 ([#1248](https://github.com/nrkno/sofie-core/issues/1248)) ([0613f74](https://github.com/nrkno/sofie-core/commit/0613f740c1e2f740d7d9c39bc72178e301f5f72f))
66+
- stringify piece NoraContent payload SOFIE-3398 ([#1248](https://github.com/nrkno/sofie-core/issues/1248)) ([0613f74](https://github.com/nrkno/sofie-core/commit/0613f740c1e2f740d7d9c39bc72178e301f5f72f))
10867

10968
# [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
11069

111-
11270
### Features
11371

114-
* stringify piece NoraContent payload SOFIE-3398 ([#1248](https://github.com/nrkno/sofie-core/issues/1248)) ([0613f74](https://github.com/nrkno/sofie-core/commit/0613f740c1e2f740d7d9c39bc72178e301f5f72f))
115-
72+
- stringify piece NoraContent payload SOFIE-3398 ([#1248](https://github.com/nrkno/sofie-core/issues/1248)) ([0613f74](https://github.com/nrkno/sofie-core/commit/0613f740c1e2f740d7d9c39bc72178e301f5f72f))
11673

11774
# [1.51.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.50.4...v1.51.0-in-testing.0) (2024-08-19)
11875

@@ -182,7 +139,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
182139
- typed publications in gateways/peripheraldevices SOFIE-1183 ([#1056](https://github.com/nrkno/sofie-core/issues/1056)) ([0c3c1bf](https://github.com/nrkno/sofie-core/commit/0c3c1bfd2bb779034976dc34e49aa6e664ea874b))
183140
- update meteor to 2.12 SOFIE-2368 ([#931](https://github.com/nrkno/sofie-core/issues/931)) ([d7dfb71](https://github.com/nrkno/sofie-core/commit/d7dfb71d19405267cab5e2abc39794a80acb30b1))
184141

185-
186142
## [1.50.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.4...v1.50.5) (2024-09-19)
187143

188144
**Note:** Version bump only for package @sofie-automation/blueprints-integration

packages/documentation/docs/for-developers/data-model.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ In every case, any layout changes and any scheduled cleanup are performed by the
1818

1919
This category of collections is rather loosely defined, as it ends up being everything that doesn't belong somewhere else
2020

21-
This consists of anything that is configurable from the Sofie UI, anything needed soley for the UI and some other bits. Additionally, there are some collections which are populated by other portions of a Sofie system, such as by package manager, through an API over DDP.
21+
This consists of anything that is configurable from the Sofie UI, anything needed soley for the UI and some other bits. Additionally, there are some collections which are populated by other portions of a Sofie system, such as by Package Manager, through an API over DDP.
2222
Currently, there is not a very clearly defined flow for modifying these documents, with the UI often making changes directly with minimal or no validation.
2323

2424
This includes:
@@ -76,7 +76,7 @@ The collections which are owned by the ingest workers are:
7676
- [Segments](https://github.com/nrkno/sofie-core/blob/master/packages/corelib/src/dataModel/Segments.ts)
7777

7878
These collections model a Rundown from the NRCS in a Sofie form. Almost all of these contain documents which are largely generated by blueprints.
79-
Some of these collections are used by package manager to initiate work, while others form a view of the Rundown for the users, and are used as part of the model for playout.
79+
Some of these collections are used by Package Manager to initiate work, while others form a view of the Rundown for the users, and are used as part of the model for playout.
8080

8181
### Playout
8282

packages/documentation/docs/for-developers/json-config-schema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Names of the enum values as generated for the typescript enum, which we display
6060

6161
Note: Only valid for blueprint configuration.
6262

63-
Sometimes it can be useful to reference other values. This property can be used on string fields, to let sofie generate a dropdown populated with values valid in the current context.
63+
Sometimes it can be useful to reference other values. This property can be used on string fields, to let Sofie generate a dropdown populated with values valid in the current context.
6464

6565
#### `mappings`
6666

packages/documentation/docs/for-developers/publications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ There has been a recent push towards using more 'custom' publications for stream
3232
To achieve this, we have an `optimisedObserver` flow which is designed to help maange to a custom publication, with a few methods to fill in to setup the reactivity and the data transformation.
3333

3434
One such publication is the `PieceContentStatus`, prior to version 1.50, this was computed inside the UI.
35-
A brief overview of this publication, is that it looks at each Piece in a Rundown, and reports whether the Piece is 'OK'. This check is primarily focussed on Pieces containing clips, where it will check the metadata generated by either package manager or media manager to ensure that the clip is marked as being ready for playout, and that it has the correct format and some other quality checks.
35+
A brief overview of this publication, is that it looks at each Piece in a Rundown, and reports whether the Piece is 'OK'. This check is primarily focussed on Pieces containing clips, where it will check the metadata generated by Package Manager to ensure that the clip is marked as being ready for playout, and that it has the correct format and some other quality checks.
3636

3737
To do this on the client meant needing to subscribe to the whole contents of a couple of MongoDB collections, as it is not easy to determine which documents will be needed until the check is being run. This caused some issues as these collections could get rather large. We also did not always have every Piece loaded in the UI, so had to defer some of the computation to the backend via polling.
3838

packages/documentation/docs/user-guide/features/access-levels.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ sidebar_position: 3
66

77
## Permissions
88

9-
There are a few different access levels that users can be assigned. They are not heirarchical, you will often need to enable multiple for each user.
10-
Any client that can access sofie always has at least view-only access to the rundowns, and system status pages.
9+
There are a few different access levels that users can be assigned. They are not heirarchical, you will often need to enable multiple for each user.
10+
Any client that can access Sofie always has at least view-only access to the rundowns, and system status pages.
1111

1212
| Level | Summary |
1313
| :------------ | :----------------------------------------------------------------------------------------------------------------------------------------------- |

0 commit comments

Comments
 (0)