OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' into release/v1.2.0

pull/1591/head
Chocobozzz 2019-01-29 08:42:12 +01:00
parent 185a4abd23 2c0070c8f3
commit d452048127
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -133,7 +133,7 @@ You can also join the cheerful bunch that makes our community:
* Chat<a name="contact"></a>: * Chat<a name="contact"></a>:
* IRC : **[#peertube on chat.freenode.net:6697](https://kiwiirc.com/client/irc.freenode.net/#peertube)** * IRC : **[#peertube on chat.freenode.net:6697](https://kiwiirc.com/client/irc.freenode.net/#peertube)**
* Matrix (bridged on the IRC channel) : **[#peertube:matrix.org](https://matrix.to/#/#peertube:matrix.org)** * Matrix (bridged on IRC and [Discord](https://discord.gg/wj8DDUT)) : **[#peertube:matrix.org](https://matrix.to/#/#peertube:matrix.org)**
* Forum: * Forum:
* Framacolibri: [https://framacolibri.org/c/peertube](https://framacolibri.org/c/peertube) * Framacolibri: [https://framacolibri.org/c/peertube](https://framacolibri.org/c/peertube)

4
client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html
View File

@ -40,10 +40,10 @@
<td class="action-cell"> <td class="action-cell">
<ng-container *ngIf="videoChangeOwnership.status === 'WAITING'"> <ng-container *ngIf="videoChangeOwnership.status === 'WAITING'">
<my-button i18n label="Accept" <my-button i18n label="Accept"
icon="icon-tick" icon="tick"
(click)="openAcceptModal(videoChangeOwnership)"></my-button> (click)="openAcceptModal(videoChangeOwnership)"></my-button>
<my-button i18n label="Refuse" <my-button i18n label="Refuse"
icon="icon-cross" icon="cross"
(click)="refuse(videoChangeOwnership)">Refuse</my-button> (click)="refuse(videoChangeOwnership)">Refuse</my-button>
</ng-container> </ng-container>
</td> </td>

1
client/src/app/shared/icons/global-icon.component.ts
View File

@ -19,6 +19,7 @@ const icons = {
'delete': require('../../../assets/images/global/delete.html'), 'delete': require('../../../assets/images/global/delete.html'),
'cross': require('../../../assets/images/global/cross.html'), 'cross': require('../../../assets/images/global/cross.html'),
'validate': require('../../../assets/images/global/validate.html'), 'validate': require('../../../assets/images/global/validate.html'),
'tick': require('../../../assets/images/global/tick.html'),
'dislike': require('../../../assets/images/video/dislike.html'), 'dislike': require('../../../assets/images/video/dislike.html'),
'heart': require('../../../assets/images/video/heart.html'), 'heart': require('../../../assets/images/video/heart.html'),
'like': require('../../../assets/images/video/like.html'), 'like': require('../../../assets/images/video/like.html'),

2
server/tests/api/check-params/accounts.ts
View File

@ -10,7 +10,7 @@ import {
} from '../../../../shared/utils/requests/check-api-params' } from '../../../../shared/utils/requests/check-api-params'
import { getAccount } from '../../../../shared/utils/users/accounts' import { getAccount } from '../../../../shared/utils/users/accounts'
describe('Test users API validators', function () { describe('Test accounts API validators', function () {
const path = '/api/v1/accounts/' const path = '/api/v1/accounts/'
let server: ServerInfo let server: ServerInfo