Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

7231 Commits

Author SHA1 Message Date
Gregory Martin
62775c891a Delete visual_progress_enabled waffle flag. 
https://openedx.atlassian.net/browse/EDUCATOR-2333
 2018-04-06 15:07:16 -04:00
Tyler Hallada
d31249ba20 Studio-frontend in-context image selection modal 
Open edit image modal via a custom signal

Send img tag attributes in open signal

Send natural image dimensions if no attr specified

Add new modal button in addition to old button

Also load built CSS when waffle switch on

Swap out TinyMCE toolbar button on waffle switch

Pass LANGUAGE_CODE from Django to template to studio-frontend

Define request.LANGUAGE_CODE in test_container_page.py
 2018-04-04 15:48:36 -04:00
Alex Dusenbery
1cbf7ab0fb EDUCATOR-1290 | Remove over-limit block keys randomly for library content blocks. 2018-03-31 13:43:11 -04:00
noraiz-anwar
f18e0b881c use library summary to fetch metadata 2018-03-27 15:57:14 +05:00
Alex Dusenbery
a996822094 Revert "Revert "Track viewing of individual blocks."" 
This reverts commit e2675f57b5f747b6a9e21067c75911fbd0341943.
 2018-03-22 10:37:40 -04:00
Eric Fischer
f1fa7b8e06 pass title/label to LTI consumers 2018-03-20 12:51:39 -04:00
Muhammad Ammar
04bf165ec9 Merge pull request #17696 from edx/ammar/update-transcripts-util 
update get_transcript util
 2018-03-15 20:47:01 +05:00
Alex Dusenbery
82d5bef4f6 EDUCATOR-1290 | Create a new random.Random instance when selecting from library content blocks. 2018-03-15 11:31:41 -04:00
muhammad-ammar
f6315483cd update get_transcript util 2018-03-15 15:15:20 +05:00
Waheed Ahmed
c362ff9847 Enable HLS video encodings for mobile. 
Return HLS video encodings from blocks api for mobile.

LEARNER-4167
 2018-03-12 11:24:14 +05:00
muhammad-ammar
a01ba7621e transcript util 
EDUCATOR-2131
 2018-03-07 23:02:15 +05:00
Mushtaq Ali
36483f938d Export video transcripts - EDUCATOR-1789 2018-03-06 15:25:46 +05:00
John Eskew
a7c09be6f0 Merge pull request #17369 from mitodl/pdpinch/less-escaping-of-errors 
Reduce escaping on sandbox errors returned to learners
 2018-02-28 17:13:25 -05:00
Alex Dusenbery
8bcdcc522e EDUCATOR-1290 | Make sure we have a key with a course id in it before library content logging call. 2018-02-28 09:49:25 -05:00
Alex Dusenbery
05319ab516 Fixup logging statement for randomized blocks. 2018-02-27 10:28:07 -05:00
Peter Pinch
9ee7ef1acf reduce escaping on sandbox errors returned to learners 2018-02-26 21:51:55 -05:00
Bill DeRusha
d4b57bc218 Removed self-paced feature flag from code 2018-02-26 13:44:53 -05:00
Alex Dusenbery
919355cab1 Revert "Track viewing of individual blocks." 
This reverts commit 4946b6b296.
 2018-02-20 14:42:28 -05:00
Qubad786
c90aa33cb8 Integrate with the updated VAL api utils. 2018-02-16 19:06:44 +05:00
J. Cliff Dyer
4946b6b296 Track viewing of individual blocks. 
* Implement a ViewedEvent handling system which calls handlers when a
  block has been viewed for 5 seconds (configurable).
* Hook up Verticals to register their children blocks with this event,
  and submit completions once seen.

OSPR-2093
OC-3358
 2018-02-15 15:13:48 -05:00
George Schneeloch
6aa87d43c0 Fix broken link in comment 2018-02-14 14:48:07 -05:00
Sanford Student
8956739a34 Add the visual indicator to the sequence horizontal nav bar to mark verticals completed 
EDUCATOR-2189
 2018-02-12 15:26:40 -05:00
Tyler Hallada
523d479ce0 Temporarily comment bad index in ensure_indexes 2018-02-09 15:44:28 -05:00
Tyler Hallada
ffbb0c16ef Merge pull request #17322 from edx/thallada/assets-case-insensitive-sort 
EDUCATOR-2191 Use Mongo aggregate hack to sort case-insensitive
 2018-02-05 14:05:32 -05:00
Tyler Hallada
be474b5d61 Merge pull request #17117 from edx/thallada/contentstore-index-displayname-fix 
Fix typos in contentstore's mongo index keys
 2018-02-05 14:03:54 -05:00
Tyler Hallada
c959ebce01 Add Jira ticket number to TODO comment 2018-02-05 11:27:43 -05:00
Tyler Hallada
45f9b88298 Fix modulestore mongo tests 2018-02-05 11:27:43 -05:00
Tyler Hallada
df5671927f Handle no assets results case properly 2018-02-05 11:27:43 -05:00
Tyler Hallada
1710021c0d Don't sort when sort is None 2018-02-05 11:27:43 -05:00
Tyler Hallada
b55aeb4798 Use Mongo aggregate hack to sort case-insensitive 2018-02-05 11:27:43 -05:00
Tyler Hallada
32e5679d7f Also fix displayname typo in ensure_index comment 2018-02-05 10:35:38 -05:00
Tyler Hallada
fbb65c22c8 Fix typos in contentstore's mongo index keys 
"display_name" was specified as a key to two indexes, but items in the collection have the key "displayname" without an underscore.
 2018-02-05 10:35:38 -05:00
Jeremy Bowman
2bd0c3d9a1 PLAT-1917 Stop using deprecated Location and AssetLocation 2018-02-03 00:31:59 -05:00
Jeremy Bowman
938c9670cc Merge pull request #17376 from edx/jmbowman/PLAT-1915 
PLAT-1915 Stop using deprecated BaseException.message
 2018-02-01 10:24:06 -05:00
Feanil Patel
7dd16638bd Merge pull request #17358 from edx/feanil/flaky_html5_test 
Remove a flaky html5 video test.
 2018-02-01 09:41:23 -05:00
Jeremy Bowman
5289c7e828 PLAT-1915 Stop using deprecated BaseException.message 2018-01-31 17:22:01 -05:00
Feanil Patel
6c70147e86 Remove a flaky html5 video test. 2018-01-30 15:13:19 -05:00
Sofiya Semenova
72d300b822 Merge pull request #17290 from edx/sofiya/ed-2149 
Test that video completion data is only being sent after a video has been watched, and not on page load
 2018-01-29 17:24:53 -05:00
Sofiya Semenova
078ed719a0 Test that video is only completed upon being watched 2018-01-29 15:52:22 -05:00
David Ormsbee
b0f67c975d Merge pull request #16322 from mitodl/capa_show_answer_fix 
Fix for courses which have url_names with colons, e.g. problem:question1
 2018-01-29 15:07:16 -05:00
Amir Qayyum Khan
3bda024a66 Fixed for courses which have url_names with colons, e.g. problem:question1 
What's this PR do?
It fixes display.js to escape colons in element ID's so they can be selected with jquery,
Previously jquery was throwing errors about unsupported pseudos, e.g.:

unrecognized expression: unsupported pseudo: pset1_1_2_1
How should this be manually tested?
create a course with column (:) in its problem id, and see console for any issue

Added tests
 2018-01-29 22:38:04 +05:00
Qubad786
287f4836af update val version and clean external video export tests 2018-01-29 19:05:55 +05:00
John Eskew
fa7bb1ea81 Merge pull request #17311 from mitodl/python_lib_import_fix_v2 
Enabled python code lib import with GIT_IMPORT_STATIC set to False
 2018-01-26 14:41:12 -05:00
Qubad786
64555c60c0 Move request_cache to openedx.core.djangoapps 2018-01-26 15:09:25 +05:00
Gavin Sidebottom
382b6069d8 PR feedback (added docstring notes, cleared up log messages) 2018-01-25 16:09:13 -05:00
Gavin Sidebottom
ec0263bc5b changed 'course code lib' references to 'python lib' to maintain consistency 2018-01-25 16:08:57 -05:00
Gavin Sidebottom
8476f19463 Enabled python code lib import with GIT_IMPORT_STATIC set to False 2018-01-25 16:08:25 -05:00
sanfordstudent
fda773721c Merge pull request #17285 from edx/sstudent/hide_cert_setting 
deprecate html setting for web certs and set to true by default
 2018-01-24 16:27:40 -05:00
Sanford Student
e2becea8cb deprecate html setting for web certs and set to true by default 2018-01-24 15:02:44 -05:00
Jeremy Bowman
ebc54c8f1a PLAT-1890 Fixed assorted ModifyingEnforceTypeWarning warnings 2018-01-24 11:49:42 -05:00