aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.ts2
-rw-r--r--client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html2
-rw-r--r--client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss34
-rw-r--r--client/src/sass/application.scss2
-rw-r--r--server/controllers/api/users/my-subscriptions.ts7
-rw-r--r--server/models/activitypub/actor-follow.ts3
6 files changed, 43 insertions, 7 deletions
diff --git a/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.ts b/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.ts
index da8c7298f..ad9368794 100644
--- a/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.ts
+++ b/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.ts
@@ -99,7 +99,7 @@ export class MyAccountVideoChannelsComponent implements OnInit {
99 } 99 }
100 } 100 }
101 101
102 resetSearch() { 102 resetSearch () {
103 this.channelsSearch = '' 103 this.channelsSearch = ''
104 this.onChannelsSearchChanged() 104 this.onChannelsSearchChanged()
105 } 105 }
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
index 8de152b5e..a60ed885d 100644
--- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
+++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
@@ -5,7 +5,7 @@
5 Notification preferences 5 Notification preferences
6 </a> 6 </a>
7 7
8 <div class="peertube-select-container peertube-select-button ml-2"> 8 <div class="peertube-select-container peertube-select-button ml-2 mr-2">
9 <select [(ngModel)]="notificationSortType" (ngModelChange)="onChangeSortColumn()" class="form-control"> 9 <select [(ngModel)]="notificationSortType" (ngModelChange)="onChangeSortColumn()" class="form-control">
10 <option value="undefined" disabled>Sort by</option> 10 <option value="undefined" disabled>Sort by</option>
11 <option value="createdAt" i18n>Newest first</option> 11 <option value="createdAt" i18n>Newest first</option>
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss
index d586eeb0d..035fa2b27 100644
--- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss
+++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss
@@ -32,8 +32,40 @@ my-user-notifications {
32 .header { 32 .header {
33 flex-direction: column; 33 flex-direction: column;
34 34
35 & >:first-child { 35 & >:first-child, .peertube-select-container {
36 margin-bottom: 15px; 36 margin-bottom: 15px;
37 } 37 }
38
39 .peertube-select-container {
40 margin-left: 0 !important;
41 }
42 }
43}
44
45@media screen and (min-width: $mobile-view) and (max-width: $small-view) {
46 .header {
47 a {
48 font-size: 0;
49 padding: 0 13px;
50 }
51
52 .peertube-select-container {
53 width: auto !important;
54 }
55 }
56}
57
58@media screen and (min-width: $mobile-view) and (max-width: #{$small-view + $menu-width}) {
59 :host-context(.main-col:not(.expanded)) {
60 .header {
61 a {
62 font-size: 0;
63 padding: 0 13px;
64 }
65
66 .peertube-select-container {
67 width: auto !important;
68 }
69 }
38 } 70 }
39} 71}
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index ea89ca9ce..be510c08f 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -371,7 +371,7 @@ table {
371 input[type=email], 371 input[type=email],
372 textarea, 372 textarea,
373 .peertube-select-container { 373 .peertube-select-container {
374 width: 100% !important; 374 flex-grow: 1;
375 } 375 }
376 376
377 .caption input[type=text] { 377 .caption input[type=text] {
diff --git a/server/controllers/api/users/my-subscriptions.ts b/server/controllers/api/users/my-subscriptions.ts
index d207a19ae..8b88feaf3 100644
--- a/server/controllers/api/users/my-subscriptions.ts
+++ b/server/controllers/api/users/my-subscriptions.ts
@@ -13,7 +13,12 @@ import {
13 userSubscriptionAddValidator, 13 userSubscriptionAddValidator,
14 userSubscriptionGetValidator 14 userSubscriptionGetValidator
15} from '../../../middlewares' 15} from '../../../middlewares'
16import { areSubscriptionsExistValidator, userSubscriptionsSortValidator, videosSortValidator, userSubscriptionListValidator } from '../../../middlewares/validators' 16import {
17 areSubscriptionsExistValidator,
18 userSubscriptionsSortValidator,
19 videosSortValidator,
20 userSubscriptionListValidator
21} from '../../../middlewares/validators'
17import { VideoModel } from '../../../models/video/video' 22import { VideoModel } from '../../../models/video/video'
18import { buildNSFWFilter, getCountVideos } from '../../../helpers/express-utils' 23import { buildNSFWFilter, getCountVideos } from '../../../helpers/express-utils'
19import { VideoFilter } from '../../../../shared/models/videos/video-query.type' 24import { VideoFilter } from '../../../../shared/models/videos/video-query.type'
diff --git a/server/models/activitypub/actor-follow.ts b/server/models/activitypub/actor-follow.ts
index 529cb35cc..10c13304f 100644
--- a/server/models/activitypub/actor-follow.ts
+++ b/server/models/activitypub/actor-follow.ts
@@ -15,8 +15,7 @@ import {
15 Max, 15 Max,
16 Model, 16 Model,
17 Table, 17 Table,
18 UpdatedAt, 18 UpdatedAt
19 Sequelize
20} from 'sequelize-typescript' 19} from 'sequelize-typescript'
21import { FollowState } from '../../../shared/models/actors' 20import { FollowState } from '../../../shared/models/actors'
22import { ActorFollow } from '../../../shared/models/actors/follow.model' 21import { ActorFollow } from '../../../shared/models/actors/follow.model'