6 Commits

Author	SHA1	Message	Date
vrde	3ad7763577	Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k ... Conflicts: js/components/ascribe_detail/media_container.js	2015-07-15 12:21:31 +02:00
vrde	26e0957840	Fix progress bar for video encoding	2015-07-15 12:18:29 +02:00
Tim Daubenschütz	a8dd915ad7	basically reverting media player changes	2015-07-15 11:47:14 +02:00
Tim Daubenschütz	26fc2f14b3	make media container robust	2015-07-15 11:43:04 +02:00
Tim Daubenschütz	f729e3c833	add acl proxy component	2015-07-14 11:11:28 +02:00
diminator	8ac26275f5	piece view	2015-07-08 22:54:07 +02:00