git.immae.eu Git - github/Chocobozzz/PeerTube.git/commit

]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commit

projects / github / Chocobozzz / PeerTube.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: adb115f 501e961)

author	Chocobozzz <me@florianbigard.com>
	Mon, 11 Feb 2019 13:09:23 +0000 (14:09 +0100)
committer	Chocobozzz <me@florianbigard.com>
	Mon, 11 Feb 2019 13:09:23 +0000 (14:09 +0100)
commit	b718fd22374d64534bcfe69932cf562894abed6a
tree	311d3c67e2a4d1f33ebdd1dc163527de9d33d0f7	tree \| snapshot
parent	adb115f5522bea4d52456a9fc5eb4140bb064476	commit \| diff
parent	501e961199578129629cf0567033d13efced9904	commit \| diff

Merge branch 'develop' into pr/1285

19 files changed:

client/src/app/shared/video-import/video-import.service.ts	diff1 \|	diff2 \|	blob \| history
client/src/app/shared/video/video-edit.model.ts	diff1 \|	diff2 \|	blob \| history
client/src/app/shared/video/video.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-watch/video-watch.component.html	diff1 \|	diff2 \|	blob \| history
client/src/app/videos/+video-watch/video-watch.component.scss	diff1 \|	diff2 \|	blob \| history
server/controllers/api/videos/index.ts	diff1 \|	diff2 \|	blob \| history
server/helpers/custom-validators/videos.ts	diff1 \|	diff2 \|	blob \| history
server/initializers/constants.ts	diff1 \|	diff2 \|	blob \| history
server/initializers/migrations/0340-add-originally-published-at.ts	diff1 \|	\|	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
shared/models/activitypub/objects/video-torrent-object.ts	diff1 \|	diff2 \|	blob \| history
shared/models/videos/video-create.model.ts	diff1 \|	diff2 \|	blob \| history
shared/models/videos/video-update.model.ts	diff1 \|	diff2 \|	blob \| history
shared/models/videos/video.model.ts	diff1 \|	diff2 \|	blob \| history

ActivityPub-federated video streaming platform using P2P directly in your web browser