From 2e03d65032378bccf7d4fc47d4410ace67073022 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 21 Jul 2020 09:38:26 +0200 Subject: [PATCH 1/4] Fix E2E tests --- client/e2e/local-protractor.conf.js | 2 +- client/e2e/src/po/video-update.po.ts | 2 +- client/e2e/src/po/video-upload.po.ts | 2 +- .../video-add-components/video-upload.component.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 = { capabilities: { 'browserName': 'firefox', 'moz:firefoxOptions': { - binary: '/usr/bin/firefox-esr', + binary: '/usr/bin/firefox-developer-edition', // args: ["-headless"], log: { "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 { } private getSubmitButton () { - return element(by.css('.submit-button:not(.disabled) input')) + return element(by.css('.submit-container .action-button')) } } 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 { } private getSecondStepSubmitButton () { - return element(by.css('.submit-button:not(.disabled) input')) + return element(by.css('.submit-button:not(.disabled)')) } } 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 @@
Publish will be available when upload is finished
- From 73f07d387e523a8cbb73e29fe12ecbbbb80f0a2c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 21 Jul 2020 09:59:36 +0200 Subject: [PATCH 2/4] Update changelog --- CHANGELOG.md | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc04a86ff..1c8972fdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog -## v2.3.0-rc.1 +## v2.3.0 + +**Since v2.2.0** ### IMPORTANT NOTES @@ -75,20 +77,39 @@ A new endpoint to report videos will be created in PeerTube 2.4 and will also al ### Bug fixes - * Fix default anonymous theme that should use instance default - * Fix configuration form issue when auto follow index URL is empty - * Fix URL import of some videos - * Fix quota representation in profile settings **@rigelk** - * Exclude 0p from auto webtorrent quality - * Fix scroll on some pages with hash in URL - * Fix search filter in video reports - * Fix anonymous user nsfw policy - * Don't cache embed HTML page resulting in broken embed after a PeerTube upgrade - * Accessibility: + * Fix default anonymous theme that should use instance default + * Fix configuration form issue when auto follow index URL is empty + * Fix URL import of some videos + * Fix quota representation in profile settings **@rigelk** + * Exclude 0p from auto webtorrent quality + * Fix scroll on some pages with hash in URL + * Fix search filter in video reports + * Fix anonymous user nsfw policy + * Don't cache embed HTML page resulting in broken embed after a PeerTube upgrade + * Accessibility: * Add lang in document to match current locale [@rigelk in #2822](https://github.com/Chocobozzz/PeerTube/pull/2822) * Prevent duplicate id attributes for `.svg` [@rigelk in #2822](https://github.com/Chocobozzz/PeerTube/pull/2822) * Fix headings order or add missing ones [@Pandoraaa in #2871](https://github.com/Chocobozzz/PeerTube/pull/2871) * Remove uneccessary details to link titles [@Pandoraaa in #2879](https://github.com/Chocobozzz/PeerTube/pull/2879) + * Fix accessibility action buttons and display on imports and followers list [@kimsible in #2986](https://github.com/Chocobozzz/PeerTube/pull/2986) + * Fix iOS player with HLS-only videos + * Fix action buttons selection mode styles [@kimsible in #2983](https://github.com/Chocobozzz/PeerTube/pull/2983) + + +**Since v2.3.0-rc.1** + +### Bug fixes + + * Fix broken locales + * Fix embed URL in share modal + * Handle webp images from youtube-dl + * Fix iOS player with HLS-only videos + * Fix popup issues on video miniature click when searching on the global index + * Fix username in password-reset email [@kimsible in #2960](https://github.com/Chocobozzz/PeerTube/pull/2960) + * Fix maximized icon padding in markdown textarea [@kimsible in #2963](https://github.com/Chocobozzz/PeerTube/pull/2963) + * Fix action buttons selection mode styles [@kimsible in #2983](https://github.com/Chocobozzz/PeerTube/pull/2983) + * Fix user creation in admin [@kimsible in #2985](https://github.com/Chocobozzz/PeerTube/pull/2985) + * Fix accessibility action buttons and display on imports and followers list [@kimsible in #2986](https://github.com/Chocobozzz/PeerTube/pull/2986) ## v2.2.0 From 99d031a2abbfb7a243811215deb8e67e85f30e19 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 21 Jul 2020 10:02:51 +0200 Subject: [PATCH 3/4] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c8972fdf..25731ce74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ### IMPORTANT NOTES + * Add `client_overrides` directory in configuration file. **You must configure it in your production.yaml** * Deprecate `/videos/abuse` endpoint. A 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) * Renamed videos blacklist feature to videos blocks/blocklist @@ -38,6 +39,10 @@ A new endpoint to report videos will be created in PeerTube 2.4 and will also al * [Auto block videos (alpha)](https://framagit.org/framasoft/peertube/official-plugins/-/tree/master/peertube-plugin-auto-block-videos) +### Plugins/Themes/Embed API + + * 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) + ### Features * :tada: Add global search support (has to be explicitely enabled by admins) From 97aaeadad537cc6b19f508f074c3fba01ed1e93b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 21 Jul 2020 10:03:58 +0200 Subject: [PATCH 4/4] Bumped to version v2.3.0 --- client/package.json | 2 +- package.json | 2 +- support/doc/api/openapi.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 @@ { "name": "peertube-client", - "version": "2.3.0-rc.1", + "version": "2.3.0", "private": true, "license": "AGPL-3.0", "author": { diff --git a/package.json b/package.json index d145bc054..c579030f5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "peertube", "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.", - "version": "2.3.0-rc.1", + "version": "2.3.0", "private": true, "licence": "AGPL-3.0", "engines": { diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml index 79f75063f..7d308a114 100644 --- a/support/doc/api/openapi.yaml +++ b/support/doc/api/openapi.yaml @@ -1,7 +1,7 @@ openapi: 3.0.0 info: title: PeerTube - version: 2.3.0-rc.1 + version: 2.3.0 contact: name: PeerTube Community url: 'https://joinpeertube.org'