aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md2
-rw-r--r--client/package.json2
-rw-r--r--package.json2
-rwxr-xr-xscripts/release.sh2
-rw-r--r--server/lib/activitypub/context.ts2
-rw-r--r--server/tests/api/activitypub/helpers.ts1
6 files changed, 6 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4638cd6d5..9c070d44f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
1# Changelog 1# Changelog
2 2
3## v4.2.0-rc.1 3## v4.2.0
4 4
5### IMPORTANT NOTES 5### IMPORTANT NOTES
6 6
diff --git a/client/package.json b/client/package.json
index bdc6c982a..b0d175b1a 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
1{ 1{
2 "name": "peertube-client", 2 "name": "peertube-client",
3 "version": "4.2.0-rc.1", 3 "version": "4.2.0",
4 "private": true, 4 "private": true,
5 "license": "AGPL-3.0", 5 "license": "AGPL-3.0",
6 "author": { 6 "author": {
diff --git a/package.json b/package.json
index 0dc2201a7..048fd405f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
1{ 1{
2 "name": "peertube", 2 "name": "peertube",
3 "description": "PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.", 3 "description": "PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.",
4 "version": "4.2.0-rc.1", 4 "version": "4.2.0",
5 "private": true, 5 "private": true,
6 "licence": "AGPL-3.0", 6 "licence": "AGPL-3.0",
7 "engines": { 7 "engines": {
diff --git a/scripts/release.sh b/scripts/release.sh
index ffe2e6b28..76970b79b 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -122,7 +122,7 @@ rm -f "./client/dist/embed-stats.json"
122 122
123 # Release types package 123 # Release types package
124 npm run generate-types-package "$version" 124 npm run generate-types-package "$version"
125 cd types/dist 125 cd packages/types/dist
126 npm publish --access public 126 npm publish --access public
127 fi 127 fi
128) 128)
diff --git a/server/lib/activitypub/context.ts b/server/lib/activitypub/context.ts
index b452cf9b3..5d6aee315 100644
--- a/server/lib/activitypub/context.ts
+++ b/server/lib/activitypub/context.ts
@@ -179,7 +179,7 @@ function buildContext (contextValue?: ContextValue) {
179 179
180 { 180 {
181 pt: 'https://joinpeertube.org/ns#', 181 pt: 'https://joinpeertube.org/ns#',
182 sc: 'http://schema.org#', 182 sc: 'http://schema.org/',
183 183
184 ...contextValue 184 ...contextValue
185 } 185 }
diff --git a/server/tests/api/activitypub/helpers.ts b/server/tests/api/activitypub/helpers.ts
index bc1de35d1..56de7a879 100644
--- a/server/tests/api/activitypub/helpers.ts
+++ b/server/tests/api/activitypub/helpers.ts
@@ -9,6 +9,7 @@ import { buildAbsoluteFixturePath } from '@shared/core-utils'
9import { isHTTPSignatureVerified, isJsonLDSignatureVerified, parseHTTPSignature } from '../../../helpers/peertube-crypto' 9import { isHTTPSignatureVerified, isJsonLDSignatureVerified, parseHTTPSignature } from '../../../helpers/peertube-crypto'
10 10
11describe('Test activity pub helpers', function () { 11describe('Test activity pub helpers', function () {
12
12 describe('When checking the Linked Signature', function () { 13 describe('When checking the Linked Signature', function () {
13 14
14 it('Should fail with an invalid Mastodon signature', async function () { 15 it('Should fail with an invalid Mastodon signature', async function () {