aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* move subtitles out of media streams in htmlBoris Bobrov2018-07-121-4/+4
* Merge branch 'transcoding_progress'Boris Bobrov2018-07-1224-80/+576
|\
| * Fixes for small bugsBoris Bobrov2018-07-125-19/+34
| * Merge branch 'multiple-qualities-frontend' into 'transcoding_progress'Vijeth Aradhya2017-08-293-11/+8
| |\
| | * Change complimentary_task to complementary_tasvijeth-aradhya2017-08-292-6/+6
| | * Remove self.entry in VideoTranscodervijeth-aradhya2017-08-272-5/+2
| * | Show default resolution progress in processing panelvijeth-aradhya2017-08-221-1/+9
| * | Add main_transcoding_progress to ProgressCallbackvijeth-aradhya2017-08-222-3/+9
| * | Add main_transcoding_progress column migrationvijeth-aradhya2017-08-222-0/+29
| |/
| * Add videojs-resolution-switcher to gitignorevijeth-aradhya2017-08-221-0/+1
| * Create a seperate test for get_all_mediavijeth-aradhya2017-08-171-3/+24
| * Add test for get_all_media()vijeth-aradhya2017-08-161-1/+20
| * Change webm to webm_video in media_size checkvijeth-aradhya2017-08-141-2/+2
| * Merge branch 'master' into 'multiple-qualities-frontend'Vijeth Aradhya2017-08-147-372/+9
| |\
| * | Small changes to fixing transcode percentagevijeth-aradhya2017-08-112-10/+8
| * | Change entry.title to entry.id in loggingvijeth-aradhya2017-08-101-3/+3
| * | Fix percentage reportingvijeth-aradhya2017-08-104-6/+26
| * | Add unicode to accomodate title of MediaEntryvijeth-aradhya2017-08-081-3/+3
| * | Replace print statements to loggingvijeth-aradhya2017-08-052-28/+18
| * | Add previous mg css to video playervijeth-aradhya2017-07-311-2/+21
| * | Modify video.html to add video-resolution-switcher pluginvijeth-aradhya2017-07-231-27/+14
| * | Add change-video-resolution.js to start video-resolution-switcher pluginvijeth-aradhya2017-07-231-0/+27
| * | Add video-resolution-switcher (video.js plugin) v0.4.2vijeth-aradhya2017-07-232-0/+2
| * | Change video.js version to v5.20.1vijeth-aradhya2017-07-232-2/+2
| * | Revert "Modify video template to accomodate multiple resolutions"vijeth-aradhya2017-07-231-14/+27
| * | Revert "Add change-video-resolution.js to start the plugin"vijeth-aradhya2017-07-231-43/+0
| * | Revert "Modify video-js link folder and change version"vijeth-aradhya2017-07-231-1/+1
| * | Revert "Add video-resolution-switcher (v0.4.2) plugin"vijeth-aradhya2017-07-2316-1181/+0
| * | Add video-resolution-switcher (v0.4.2) pluginvijeth-aradhya2017-07-1816-0/+1181
| * | Modify video-js link folder and change versionvijeth-aradhya2017-07-181-1/+1
| * | Add change-video-resolution.js to start the pluginvijeth-aradhya2017-07-161-0/+43
| * | Modify video template to accomodate multiple resolutionsvijeth-aradhya2017-07-161-27/+14
| * | Add get_all_media() in MediaEntryMixinvijeth-aradhya2017-07-161-0/+27
| * | Add property to media_fetch_ordervijeth-aradhya2017-07-031-1/+10
| * | Fix test_accepted_resolutionsvijeth-aradhya2017-06-271-6/+7
| * | Implement copy_original and _keep_bestvijeth-aradhya2017-06-252-10/+38
| * | Test whether video is transcoded to all resolutionsvijeth-aradhya2017-06-251-3/+11
| * | Test accepted_files and accepted_resolutionsvijeth-aradhya2017-06-252-1/+22
| * | Add test_chord for TestSubmissionVideovijeth-aradhya2017-06-251-8/+74
| * | Add VideoProcessingManager.workflow() testsvijeth-aradhya2017-06-251-0/+69
| * | Use tuple as default return type of workflow()vijeth-aradhya2017-06-212-5/+6
| * | Add choice of video resolutions for instance ownervijeth-aradhya2017-06-202-12/+28
| * | Render webm_480 as default if webm_video is absentvijeth-aradhya2017-06-173-4/+11
| * | Fix test_celery_setup errorvijeth-aradhya2017-06-171-2/+3
| * | Simple hack to handle main workflow problemvijeth-aradhya2017-06-179-47/+15
| * | Celery concurrency is set to onevijeth-aradhya2017-06-131-1/+1
| * | Add complimentary_tasks to the celery groupvijeth-aradhya2017-06-131-10/+7
| * | Individual resolution transcoding fixesvijeth-aradhya2017-06-132-8/+5
| * | Celery Priority testing with debug statementsvijeth-aradhya2017-06-1310-47/+80
| * | Few more changes to celery priority taskingvijeth-aradhya2017-06-121-11/+16