Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,965 Commits 1 Branch 0 Tags
bc790400a9a32ee8b66dc2873ddbadfda504e44e
Commit Graph

8421 Commits

Author SHA1 Message Date
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
Michael Frey
47272087cf Merge pull request #17247 from caesar2164/problem-loading-spinner 
Add FA loading spinner to each problem
 2018-01-23 08:24:58 -05:00
Eric Fischer
097e000a24 Merge pull request #16191 from proversity-org/proversity/course-visibility-in-catalog 
add DEFAULT_COURSE_VISIBILITY_IN_CATALOG flag
 2018-01-23 08:10:25 -05:00
Sofiya Semenova
b3294bdea1 Merge pull request #17240 from edx/sofiya/ed-2140 
Video completion recording does not happen at the end of the video
 2018-01-22 11:38:00 -05:00
Jose Antonio Gonzalez
cd2a31aacc set default course visibility in catalog 2018-01-22 08:35:57 +02:00
Sofiya Semenova
380273bcaa Video completion marked at end of video 2018-01-19 14:39:49 -05:00
Giulio Gratta
c3ff17a8f1 Add FA loading spinner to each problem 
- This is so that if a site loads slowly users know which/how many problems they need to wait for.
- Spinner gets replaced automatically by problem content when it loads.
 2018-01-19 11:28:10 -08:00
Bill Filler
733c275db0 Merge pull request #17083 from edx/bfiller/gated-content-combined 
Conditionally display gated content in outline and courseware
 2018-01-19 12:41:11 -05:00
Sanford Student
af0909e8cf reducing logging for EDUCATOR-1290 2018-01-19 11:34:44 -05:00
Bill Filler
4fe5f3457d Conditionally display gated content in courseware 
Display gated sections in course outline, navigation and in the course
when user has met prerequiste condition.

WL-1273, WL-1317
 2018-01-18 12:34:19 -05:00
Jeremy Bowman
7d436a18ee PLAT-1858 Better capture of deprecation warnings 2018-01-12 18:04:32 -05:00
Jeremy Bowman
113e8dde61 PLAT-1885 Stop using deprecated BlockUsageLocator properties 2018-01-12 16:40:21 -05:00
Jeremy Bowman
c24d8c1b28 Merge pull request #17167 from edx/jmbowman/PLAT-1884 
PLAT-1884 Replace deprecated xblock.fragment usage
 2018-01-11 16:25:13 -05:00
Nimisha Asthagiri
bb738571ce Merge pull request #17093 from edx/arch/django-app-plugin 
Django App Plugins
 2018-01-11 15:49:45 -05:00
Jeremy Bowman
f8e5e38cc4 PLAT-1884 Replace deprecated xblock.fragment usage 2018-01-11 14:20:12 -05:00
Jeremy Bowman
4026c25f7a Merge pull request #17133 from edx/jmbowman/PLAT-1873_2 
PLAT-1873 to_deprecated_string() cleanup part 2
 2018-01-10 13:45:15 -05:00
Qubad786
090e5dc534 Transcript upload backend for Video Upload Page – EDUCATOR-1854 2018-01-09 17:03:44 +05:00
Nimisha Asthagiri
a37d09aefb Move PluginManager out of api folder 2018-01-08 19:15:23 -05:00
Jeremy Bowman
669aa13ad6 PLAT-1873 to_deprecated_string() cleanup part 2 2018-01-08 17:26:55 -05:00
Jeremy Bowman
d3d6272d8f PLAT-1873 to_deprecated_string() cleanup part 1 2018-01-08 13:51:42 -05:00
Ammar Naqvi
fde830b73a Updated subsections grade percentage to start rounding 
Changed subsection gating on course outline to consider rounded off grade instead of absolute grade to decide whether to show a subsection which has a prerequisite or not.
EDUCATOR-1676
 2018-01-08 15:29:42 +05:00
Sanford Student
14618c35de EDUCATOR-1290: logging 2018-01-03 16:36:23 -05:00
christopher lee
10f1907ff4 Wrap strings in gettext for graders file 2018-01-03 10:27:46 -05:00
Jeremy Bowman
e98420dd8d Merge pull request #16979 from edx/jmbowman/PLAT-1861 
PLAT-1861 Upgrade to pyfilesystem2
 2017-12-22 15:48:48 -05:00
Jeremy Bowman
65472399df PLAT-1861 Upgrade to pyfilesystem2 2017-12-22 14:44:24 -05:00
Daniel Clemente
ecf01d1b52 Adds a course option to auto-advance videos. 
If enabled for a course, as soon as the video ends, the next unit or subsection
will be loaded, and if it contains a single video, that video will be played.

Course authors can enable the setting for a course, but learners can toggle the
setting on or off once it's enabled on the course.
 2017-12-21 21:06:05 +10:30
J. Cliff Dyer
1fc43bf60d Define custom completion for VideoModule 
Update the VideoModule to publish a completion event when the player
reaches 95% complete, and submit a BlockCompletion when that event
occurs.

OC-3091
MCKIN-5897
 2017-12-19 14:12:28 -05:00
Jeremy Bowman
1dbdee9c54 Revert "PLAT-1858 Better capture of deprecation warnings" 2017-12-18 21:18:02 -05:00
Jeremy Bowman
b26fe5fd24 PLAT-1858 Better capture of deprecation warnings 2017-12-18 14:59:05 -05:00
Sofiya Semenova
b159c2712e Merge pull request #16864 from edx/sofiya/symmath 
Educator-1879 Symmath fails to initialize because of requests library
 2017-12-13 10:18:44 -05:00
Ned Batchelder
3d49d80b58 Fix safe_lxml. SEC-338 
The imports were sorted in May, which broke the monkeypatching in
safe_lxml.  I added two tests that the XML parsers are properly patched,
but they didn't pass until I added the monkeypatching to the start of
the test runs.  Once that was done, some tests failed because they
relied on specific details of how empty elements are represented.  Those
tests are now fixed.
 2017-12-12 16:13:47 -05:00
Sofiya Semenova
8030f82e1c Ed-1879 Remove requests import in symmath 2017-12-12 15:57:42 -05:00
Jeremy Bowman
05e7a4d671 PLAT-1830 Allow running any test suite in tox 2017-12-11 15:43:01 -05:00
Eric Fischer
25eb31877b Merge pull request #16843 from edx/why_did_we_not_do_this_sooner 
fix some eslint ish
 2017-12-11 12:08:21 -05:00