diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-01-11 09:06:44 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-01-11 09:06:44 +0100 |
| commit | 7e4e8119e18d1d52ed0648e922fe03dc9a35fcbc (patch) | |
| tree | d5ba7b14c01a9e864f28f45883d4e3f0fa0984e6 | |
| parent | f42c21528b92d76de8ab9a72a1c2f2d9ec51f2df (diff) | |
| parent | 04b2996bb0d7407ff500ab39fadd8e5b596c05e2 (diff) | |
| download | PeerTube-7e4e8119e18d1d52ed0648e922fe03dc9a35fcbc.tar.gz PeerTube-7e4e8119e18d1d52ed0648e922fe03dc9a35fcbc.tar.zst PeerTube-7e4e8119e18d1d52ed0648e922fe03dc9a35fcbc.zip | |
Merge branch 'develop' into release/3.0.0
| -rw-r--r-- | client/src/app/+my-account/my-account-applications/my-account-applications.component.ts | 2 | ||||
| -rw-r--r-- | client/src/app/modal/quick-settings-modal.component.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts b/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts index 756644990..5e9525fbb 100644 --- a/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts +++ b/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts | |||
| @@ -14,7 +14,7 @@ export class MyAccountApplicationsComponent implements OnInit { | |||
| 14 | feedUrl: string | 14 | feedUrl: string |
| 15 | feedToken: string | 15 | feedToken: string |
| 16 | 16 | ||
| 17 | private baseURL = environment.originServerUrl | 17 | private baseURL = environment.originServerUrl || window.location.origin |
| 18 | 18 | ||
| 19 | constructor ( | 19 | constructor ( |
| 20 | private authService: AuthService, | 20 | private authService: AuthService, |
diff --git a/client/src/app/modal/quick-settings-modal.component.html b/client/src/app/modal/quick-settings-modal.component.html index 62013c733..7794e10c4 100644 --- a/client/src/app/modal/quick-settings-modal.component.html +++ b/client/src/app/modal/quick-settings-modal.component.html | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | </div> | 5 | </div> |
| 6 | 6 | ||
| 7 | <div class="modal-body"> | 7 | <div class="modal-body"> |
| 8 | <div class="mb-4 font-italic">These settings apply only to your session on this instance.</div> | 8 | <div i18n class="mb-4 font-italic">These settings apply only to your session on this instance.</div> |
| 9 | 9 | ||
| 10 | <div i18n class="mb-4 quick-settings-title">Display settings</div> | 10 | <div i18n class="mb-4 quick-settings-title">Display settings</div> |
| 11 | 11 | ||