aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-07-21 11:16:28 +0200
committerChocobozzz <me@florianbigard.com>2020-07-21 11:16:28 +0200
commit2291a412d25bd139398ca9e7a5131d0c1e4ffd7d (patch)
tree0bd9d8b135e43ed681f6949040ec2cf698080549
parentd28d13581fe8cb4c72ee7c2ef43cb1196fd8b5fa (diff)
parent97aaeadad537cc6b19f508f074c3fba01ed1e93b (diff)
downloadPeerTube-2291a412d25bd139398ca9e7a5131d0c1e4ffd7d.tar.gz
PeerTube-2291a412d25bd139398ca9e7a5131d0c1e4ffd7d.tar.zst
PeerTube-2291a412d25bd139398ca9e7a5131d0c1e4ffd7d.zip
Merge branch 'release/2.3.0' into develop
-rw-r--r--CHANGELOG.md48
-rw-r--r--client/e2e/local-protractor.conf.js2
-rw-r--r--client/e2e/src/po/video-update.po.ts2
-rw-r--r--client/e2e/src/po/video-upload.po.ts2
-rw-r--r--client/package.json2
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html2
-rw-r--r--package.json2
-rw-r--r--support/doc/api/openapi.yaml2
8 files changed, 44 insertions, 18 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc04a86ff..25731ce74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,12 @@
1# Changelog 1# Changelog
2 2
3## v2.3.0-rc.1 3## v2.3.0
4
5**Since v2.2.0**
4 6
5### IMPORTANT NOTES 7### IMPORTANT NOTES
6 8
9 * Add `client_overrides` directory in configuration file. **You must configure it in your production.yaml**
7 * Deprecate `/videos/abuse` endpoint. 10 * Deprecate `/videos/abuse` endpoint.
8A new endpoint to report videos will be created in PeerTube 2.4 and will also allow to report accounts and comments (`/videos/abuse` will be removed in 3.0) 11A new endpoint to report videos will be created in PeerTube 2.4 and will also allow to report accounts and comments (`/videos/abuse` will be removed in 3.0)
9 * Renamed videos blacklist feature to videos blocks/blocklist 12 * Renamed videos blacklist feature to videos blocks/blocklist
@@ -36,6 +39,10 @@ A new endpoint to report videos will be created in PeerTube 2.4 and will also al
36 * [Auto block videos (alpha)](https://framagit.org/framasoft/peertube/official-plugins/-/tree/master/peertube-plugin-auto-block-videos) 39 * [Auto block videos (alpha)](https://framagit.org/framasoft/peertube/official-plugins/-/tree/master/peertube-plugin-auto-block-videos)
37 40
38 41
42### Plugins/Themes/Embed API
43
44 * Add ability to override client assets: logo - favicon - PWA icons - PWA manifest name and description [@kimsible in #2897](https://github.com/Chocobozzz/PeerTube/pull/2897)
45
39### Features 46### Features
40 47
41 * :tada: Add global search support (has to be explicitely enabled by admins) 48 * :tada: Add global search support (has to be explicitely enabled by admins)
@@ -75,20 +82,39 @@ A new endpoint to report videos will be created in PeerTube 2.4 and will also al
75 82
76### Bug fixes 83### Bug fixes
77 84
78 * Fix default anonymous theme that should use instance default 85 * Fix default anonymous theme that should use instance default
79 * Fix configuration form issue when auto follow index URL is empty 86 * Fix configuration form issue when auto follow index URL is empty
80 * Fix URL import of some videos 87 * Fix URL import of some videos
81 * Fix quota representation in profile settings **@rigelk** 88 * Fix quota representation in profile settings **@rigelk**
82 * Exclude 0p from auto webtorrent quality 89 * Exclude 0p from auto webtorrent quality
83 * Fix scroll on some pages with hash in URL 90 * Fix scroll on some pages with hash in URL
84 * Fix search filter in video reports 91 * Fix search filter in video reports
85 * Fix anonymous user nsfw policy 92 * Fix anonymous user nsfw policy
86 * Don't cache embed HTML page resulting in broken embed after a PeerTube upgrade 93 * Don't cache embed HTML page resulting in broken embed after a PeerTube upgrade
87 * Accessibility: 94 * Accessibility:
88 * Add lang in document to match current locale [@rigelk in #2822](https://github.com/Chocobozzz/PeerTube/pull/2822) 95 * Add lang in document to match current locale [@rigelk in #2822](https://github.com/Chocobozzz/PeerTube/pull/2822)
89 * Prevent duplicate id attributes for `.svg` [@rigelk in #2822](https://github.com/Chocobozzz/PeerTube/pull/2822) 96 * Prevent duplicate id attributes for `.svg` [@rigelk in #2822](https://github.com/Chocobozzz/PeerTube/pull/2822)
90 * Fix headings order or add missing ones [@Pandoraaa in #2871](https://github.com/Chocobozzz/PeerTube/pull/2871) 97 * Fix headings order or add missing ones [@Pandoraaa in #2871](https://github.com/Chocobozzz/PeerTube/pull/2871)
91 * Remove uneccessary details to link titles [@Pandoraaa in #2879](https://github.com/Chocobozzz/PeerTube/pull/2879) 98 * Remove uneccessary details to link titles [@Pandoraaa in #2879](https://github.com/Chocobozzz/PeerTube/pull/2879)
99 * Fix accessibility action buttons and display on imports and followers list [@kimsible in #2986](https://github.com/Chocobozzz/PeerTube/pull/2986)
100 * Fix iOS player with HLS-only videos
101 * Fix action buttons selection mode styles [@kimsible in #2983](https://github.com/Chocobozzz/PeerTube/pull/2983)
102
103
104**Since v2.3.0-rc.1**
105
106### Bug fixes
107
108 * Fix broken locales
109 * Fix embed URL in share modal
110 * Handle webp images from youtube-dl
111 * Fix iOS player with HLS-only videos
112 * Fix popup issues on video miniature click when searching on the global index
113 * Fix username in password-reset email [@kimsible in #2960](https://github.com/Chocobozzz/PeerTube/pull/2960)
114 * Fix maximized icon padding in markdown textarea [@kimsible in #2963](https://github.com/Chocobozzz/PeerTube/pull/2963)
115 * Fix action buttons selection mode styles [@kimsible in #2983](https://github.com/Chocobozzz/PeerTube/pull/2983)
116 * Fix user creation in admin [@kimsible in #2985](https://github.com/Chocobozzz/PeerTube/pull/2985)
117 * Fix accessibility action buttons and display on imports and followers list [@kimsible in #2986](https://github.com/Chocobozzz/PeerTube/pull/2986)
92 118
93 119
94## v2.2.0 120## v2.2.0
diff --git a/client/e2e/local-protractor.conf.js b/client/e2e/local-protractor.conf.js
index a4990fcef..16f039025 100644
--- a/client/e2e/local-protractor.conf.js
+++ b/client/e2e/local-protractor.conf.js
@@ -12,7 +12,7 @@ exports.config = {
12 capabilities: { 12 capabilities: {
13 'browserName': 'firefox', 13 'browserName': 'firefox',
14 'moz:firefoxOptions': { 14 'moz:firefoxOptions': {
15 binary: '/usr/bin/firefox-esr', 15 binary: '/usr/bin/firefox-developer-edition',
16 // args: ["-headless"], 16 // args: ["-headless"],
17 log: { 17 log: {
18 "level": "info" // default is "info" 18 "level": "info" // default is "info"
diff --git a/client/e2e/src/po/video-update.po.ts b/client/e2e/src/po/video-update.po.ts
index 4de3b1b1d..752741378 100644
--- a/client/e2e/src/po/video-update.po.ts
+++ b/client/e2e/src/po/video-update.po.ts
@@ -15,6 +15,6 @@ export class VideoUpdatePage {
15 } 15 }
16 16
17 private getSubmitButton () { 17 private getSubmitButton () {
18 return element(by.css('.submit-button:not(.disabled) input')) 18 return element(by.css('.submit-container .action-button'))
19 } 19 }
20} 20}
diff --git a/client/e2e/src/po/video-upload.po.ts b/client/e2e/src/po/video-upload.po.ts
index f79927abc..9eb1e31c1 100644
--- a/client/e2e/src/po/video-upload.po.ts
+++ b/client/e2e/src/po/video-upload.po.ts
@@ -40,6 +40,6 @@ export class VideoUploadPage {
40 } 40 }
41 41
42 private getSecondStepSubmitButton () { 42 private getSecondStepSubmitButton () {
43 return element(by.css('.submit-button:not(.disabled) input')) 43 return element(by.css('.submit-button:not(.disabled)'))
44 } 44 }
45} 45}
diff --git a/client/package.json b/client/package.json
index 3ed4f58d0..a54eebc79 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": "2.3.0-rc.1", 3 "version": "2.3.0",
4 "private": true, 4 "private": true,
5 "license": "AGPL-3.0", 5 "license": "AGPL-3.0",
6 "author": { 6 "author": {
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
index 8af1687e6..95b6628f6 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
@@ -79,7 +79,7 @@
79 <div class="submit-container"> 79 <div class="submit-container">
80 <div i18n *ngIf="videoUploaded === false" class="message-submit">Publish will be available when upload is finished</div> 80 <div i18n *ngIf="videoUploaded === false" class="message-submit">Publish will be available when upload is finished</div>
81 81
82 <my-button className="orange-button" i18n-label label="Publish" icon="circle-tick" 82 <my-button className="submit-button orange-button" i18n-label label="Publish" icon="circle-tick"
83 (click)="updateSecondStep()" (keydown.enter)="updateSecondStep()" 83 (click)="updateSecondStep()" (keydown.enter)="updateSecondStep()"
84 [disabled]="isPublishingButtonDisabled()" 84 [disabled]="isPublishingButtonDisabled()"
85 ></my-button> 85 ></my-button>
diff --git a/package.json b/package.json
index d145bc054..c579030f5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
1{ 1{
2 "name": "peertube", 2 "name": "peertube",
3 "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.", 3 "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.",
4 "version": "2.3.0-rc.1", 4 "version": "2.3.0",
5 "private": true, 5 "private": true,
6 "licence": "AGPL-3.0", 6 "licence": "AGPL-3.0",
7 "engines": { 7 "engines": {
diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index a0d086324..f3edca682 100644
--- a/support/doc/api/openapi.yaml
+++ b/support/doc/api/openapi.yaml
@@ -1,7 +1,7 @@
1openapi: 3.0.0 1openapi: 3.0.0
2info: 2info:
3 title: PeerTube 3 title: PeerTube
4 version: 2.3.0-rc.1 4 version: 2.3.0
5 contact: 5 contact:
6 name: PeerTube Community 6 name: PeerTube Community
7 url: 'https://joinpeertube.org' 7 url: 'https://joinpeertube.org'