Merge branch 'release/2.3.0' into develop

5 files changed, 5 insertions, 5 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/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/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 @@
   <div class="submit-container">
     <div i18n *ngIf="videoUploaded === false" class="message-submit">Publish will be available when upload is finished</div>
 
-    <my-button className="orange-button" i18n-label label="Publish" icon="circle-tick"
+    <my-button className="submit-button orange-button" i18n-label label="Publish" icon="circle-tick"
                (click)="updateSecondStep()" (keydown.enter)="updateSecondStep()"
                [disabled]="isPublishingButtonDisabled()"
     ></my-button>