Merge branch 'develop' into pr/1285
authorChocobozzz <me@florianbigard.com>
Mon, 11 Feb 2019 13:09:23 +0000 (14:09 +0100)
committerChocobozzz <me@florianbigard.com>
Mon, 11 Feb 2019 13:09:23 +0000 (14:09 +0100)
commitb718fd22374d64534bcfe69932cf562894abed6a
tree311d3c67e2a4d1f33ebdd1dc163527de9d33d0f7
parentadb115f5522bea4d52456a9fc5eb4140bb064476
parent501e961199578129629cf0567033d13efced9904
Merge branch 'develop' into pr/1285
19 files changed:
client/src/app/shared/video-import/video-import.service.ts
client/src/app/shared/video/video-edit.model.ts
client/src/app/shared/video/video.model.ts
client/src/app/shared/video/video.service.ts
client/src/app/videos/+video-edit/shared/video-edit.component.html
client/src/app/videos/+video-edit/shared/video-edit.component.ts
client/src/app/videos/+video-watch/video-watch.component.html
client/src/app/videos/+video-watch/video-watch.component.scss
server/controllers/api/videos/index.ts
server/helpers/custom-validators/videos.ts
server/initializers/constants.ts
server/initializers/migrations/0340-add-originally-published-at.ts
server/middlewares/validators/videos/videos.ts
server/models/video/video-format-utils.ts
server/models/video/video.ts
shared/models/activitypub/objects/video-torrent-object.ts
shared/models/videos/video-create.model.ts
shared/models/videos/video-update.model.ts
shared/models/videos/video.model.ts