projects / oweals / peertube.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 53a94c7 9b712a2)
Merge branch 'develop' into pr/1217
authorChocobozzz <me@florianbigard.com>
Mon, 11 Feb 2019 10:52:34 +0000 (11:52 +0100)
committerChocobozzz <me@florianbigard.com>
Mon, 11 Feb 2019 10:52:34 +0000 (11:52 +0100)
commit88108880bbdba473cfe36ecbebc1c3c4f972e102
treeb242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0tree | snapshot
parent53a94c7cfa8368da4cd248d65df8346905938f0ccommit | diff
parent9b712a2017e4ab3cf12cd6bd58278905520159d0commit | diff
Merge branch 'develop' into pr/1217
28 files changed:
client/src/app/shared/video/video-details.model.ts diff1 | diff2 | blob | history
client/src/app/shared/video/video-edit.model.ts diff1 | diff2 | blob | history
client/src/app/shared/video/video.service.ts diff1 | diff2 | blob | history
client/src/app/videos/+video-edit/shared/video-edit.component.html diff1 | diff2 | blob | history
client/src/app/videos/+video-edit/shared/video-edit.component.ts diff1 | diff2 | blob | history
client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts diff1 | diff2 | blob | history
client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts diff1 | diff2 | blob | history
client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts diff1 | diff2 | blob | history
client/src/app/videos/+video-watch/video-watch.component.html diff1 | diff2 | blob | history
client/src/app/videos/+video-watch/video-watch.component.ts diff1 | diff2 | blob | history
server/controllers/api/videos/import.ts diff1 | diff2 | blob | history
server/controllers/api/videos/index.ts diff1 | diff2 | blob | history
server/helpers/activitypub.ts diff1 | diff2 | blob | history
server/helpers/custom-validators/activitypub/videos.ts diff1 | diff2 | blob | history
server/lib/activitypub/videos.ts diff1 | diff2 | blob | history
server/middlewares/validators/videos/videos.ts diff1 | diff2 | blob | history
server/models/video/video-format-utils.ts diff1 | diff2 | blob | history
server/models/video/video.ts diff1 | diff2 | blob | history
server/tests/api/check-params/video-imports.ts diff1 | diff2 | blob | history
server/tests/api/check-params/videos.ts diff1 | diff2 | blob | history
server/tests/api/server/follows.ts diff1 | diff2 | blob | history
server/tests/api/server/handle-down.ts diff1 | diff2 | blob | history
server/tests/api/videos/multiple-servers.ts diff1 | diff2 | blob | history
server/tests/api/videos/single-server.ts diff1 | diff2 | blob | history
server/tools/peertube-import-videos.ts diff1 | diff2 | blob | history
server/tools/peertube-upload.ts diff1 | diff2 | blob | history
shared/models/videos/video.model.ts diff1 | diff2 | blob | history
shared/utils/videos/videos.ts | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.