search

learningequality / ka-lite

KA Lite: lightweight web server for serving core Khan Academy content (videos and exercises) without needing internet connectivity
https://learningequality.org/ka-lite/
Other
456 stars 304 forks source link

[DELETED] Captions turned on by default #5466

Closed mrpau-eugene closed 7 years ago

mrpau-eugene commented 7 years ago

Summary

Enable captions by default

TODO

Issues addressed

List the issues solved or partly solved by the PR

5359

5464

codecov[bot] commented 7 years ago

Codecov Report

Merging #5466 into 0.17.x will increase coverage by 2.67%. The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           0.17.x    #5466      +/-   ##
==========================================
+ Coverage    58.7%   61.38%   +2.67%     
==========================================
  Files         118      118              
  Lines        6572     6572              
==========================================
+ Hits         3858     4034     +176     
+ Misses       2714     2538     -176
Impacted Files Coverage Δ
kalite/version.py 100% <100%> (ø) :arrow_up:
kalite/coachreports/api_views.py 93.07% <0%> (+3.84%) :arrow_up:
kalite/topic_tools/content_models.py 75.28% <0%> (+5.05%) :arrow_up:
kalite/facility/api_resources.py 95.2% <0%> (+5.6%) :arrow_up:
kalite/control_panel/api_resources.py 96.69% <0%> (+8.26%) :arrow_up:
kalite/topic_tools/content_recommendation.py 84.52% <0%> (+9.12%) :arrow_up:
kalite/shared/api_auth/auth.py 41.53% <0%> (+9.23%) :arrow_up:
kalite/shared/decorators/auth.py 42.7% <0%> (+10.41%) :arrow_up:
kalite/distributed/views.py 77.7% <0%> (+10.82%) :arrow_up:
kalite/coachreports/views.py 71.05% <0%> (+13.15%) :arrow_up:
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 153b1aa...e7e6168. Read the comment docs.

benjaoming commented 7 years ago

@mrpau-eugene

I wanted to help you by re-targeting your branch to 0.17.x, doing some commits directly to your branch.... but it didn't work very well. Since there were already lots of empty merge commits coming in from develop.

I suggest you create a new PR, where your feature branch is based off 0.17.x:

git checkout 0.17.x  # Checkout 0.17.x, add a `-b` if you haven't gotten this branch already
git pull --rebase https://github.com/learningequality/ka-lite.git 0.17.x  # Fetch latest
git checkout -b captions-turn-on  # Branch out
git cherry-pick db412fc  # Cherry pick commits from the other branch
git cherry-pick d146202
git cherry-pick 6a12365
git cherry-pick 821228b

That should make you ready to

benjaoming commented 7 years ago

Btw. the background for doing this: We want the feature to be released with 0.17.2, so your changes should target 0.17.x. I'll make sure to have it merged into develop also once it works for 0.17.x.