Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,542 Commits 1 Branch 0 Tags
3e87cb7c7d4a569fe2ae587bc428733ee61cd708
Commit Graph

8614 Commits

Author SHA1 Message Date
Calen Pennington
969728874b Merge pull request #19065 from cpennington/access-control-messaging 
Access control messaging
 2018-10-12 11:21:34 -04:00
Calen Pennington
2ce5417e0c Allow UserPartitions to specify a text or html message when a user is denied access because of their partition membership 2018-10-11 09:54:12 -04:00
Calen Pennington
72f556c1a9 Import courseware module from fully-qualified module name 2018-10-10 15:34:33 -04:00
Calen Pennington
44c6936ecb Merge pull request #18950 from cpennington/fix-educator-3262-v4 
Return an unresolved promise when loading javascript resource urls in…
 2018-09-19 19:14:15 -04:00
Calen Pennington
5b7e59e02b Return an unresolved promise when loading javascript resource urls in ConditionalModule 2018-09-19 15:00:51 -04:00
Peter Pinch
b43f2242ad more descriptive error messages for UndefinedVariable 2018-09-17 17:14:25 -04:00
Amir Qayyum Khan
0e2febbce2 OLX export: Reverted url_name from a constant to course run 
- New exported courses include course run information in:
  - `url_name` of root course node
  - file name of root node in course folder
  - root key name in policy.json
  - directory name inside policies folder

- when imported via management command, the OLX will overwrite an
available existing course with the same course key (i.e. same org,
course number and course run)
  - if there is no matching course, one will be created

- when imported via the studio web ui (or import API), the OLX will
replace the current course (no change in behavior)

- courses exported with this commit have been tested to import via
management command and studio web UI in hawthorn and ginkgo releases.
They should also work in prior releases, but have not been tested.
 2018-09-14 14:50:40 +05:00
Calen Pennington
5b71d4408b Merge pull request #18902 from cpennington/fix-educator-3262-v3 
Load all webpack chunks into fragments as correctly-typed resources
 2018-09-13 10:11:26 -04:00
Calen Pennington
461f35255c fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-12 21:54:19 -04:00
Nimisha Asthagiri
700a902b68 Cleanup and remove deprecated RequestCache Django app 
ARCH-223
 2018-09-12 14:39:11 -04:00
Calen Pennington
db2078ed2f fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-12 14:27:54 -04:00
AsadAzam
3c04f41de4 Merge pull request #18877 from edx/asad/educator-3335-fix-download-transcript-500-error 
Fixed download transcript 500 error
 2018-09-12 22:02:09 +05:00
Calen Pennington
9c32073e9b fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-11 13:56:05 -04:00
Qubad786
71e40eb798 dont stop loading on pause 2018-09-11 19:33:25 +05:00
muhammad-ammar
d23e8a3ed8 fix poster display issue with hls 
EDUCATOR-2606
 2018-09-11 19:33:25 +05:00
asadazam93
0ec8e38422 Fixed download transcript 500 error 2018-09-11 16:04:35 +05:00
Simon Chen
af3e5ba4c3 Merge pull request #18149 from mitodl/pdpinch/expose-attempts 
Expose attempt number to python custom grader
 2018-09-10 15:50:28 -04:00
Robert Raposa
ba4cc62ff8 Retire deprecated RequestCache (Take 2) 
ARCH-223
 2018-09-08 15:09:28 -04:00
Calen Pennington
16f05ecce4 fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-07 11:02:52 -04:00
Calen Pennington
15b762aaaa fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-07 10:40:09 -04:00
Calen Pennington
e6f11072b0 fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-07 09:24:35 -04:00
Calen Pennington
41c71505e3 Load all webpack chunks into fragments as correctly-typed resources 2018-09-06 15:47:13 -04:00
Calen Pennington
139d40b76b Merge pull request #18854 from cpennington/cale/edu-3262-logging 
Log conditional xblock fragment resource loading
 2018-09-05 10:40:49 -04:00
Qubad786
89925a96dc use waffle_flags from video pipeline and fix tests 2018-09-04 19:07:03 +05:00
muhammad-ammar
809175d4cf add support to enable/disable hls as primary playback 
EDUCATOR-2714
 2018-09-04 19:07:03 +05:00
Nimisha Asthagiri
4ca165f690 Revert "ARCH-223: Retire deprecated RequestCache." 2018-08-30 16:33:03 -04:00
Jolyon Bloomfield
9981b153b3 Remember to add changes before committing... 2018-08-30 16:22:50 -04:00
Jolyon Bloomfield
28e64d95cc Handle situation where attempts have been reset to 0 and problem is regraded; Update comments 2018-08-30 16:21:23 -04:00
Peter Pinch
3763d26651 clarify comments 2018-08-30 15:57:42 -04:00
Nimisha Asthagiri
8459982512 Merge pull request #18847 from edx/robrap/ARCH-223-replace-request-cache 
ARCH-223: Retire deprecated RequestCache
 2018-08-30 12:59:49 -04:00
Robert Raposa
3df339a56a Retire deprecated RequestCache. 
ARCH-223
 2018-08-30 08:55:19 -04:00
Calen Pennington
8878edea26 Log conditional xblock fragment resource loading 2018-08-29 13:46:17 -04:00
rabiaiftikhar
72cba77bbb EDUCATOR-3030 donot submit completion for grader's response while updating problem score. 2018-08-29 16:04:28 +05:00
Peter Pinch
ddd8d41906 expose attempts to python custom grader 2018-08-27 11:49:55 -04:00
Michael Youngstrom
52a8c9703b Maintain ignore file tests without storing themn on platform 2018-08-17 16:05:28 -04:00
Michael Youngstrom
75bd297337 Merge pull request #18795 from edx/youngstrom/try-unique-db 
Use a unique name for test mongo dbs
 2018-08-17 11:23:15 -04:00
Michael Youngstrom
4575c351cc Use unique db names for mongo tests 2018-08-17 10:38:37 -04:00
Calen Pennington
228868acc7 Merge pull request #18799 from edx/cale/fix-educator-3262-again 
Cale/fix educator 3262 again
 2018-08-17 09:54:30 -04:00
Calen Pennington
865e43edf3 Delay initialization of XBlocks until after all fragments have been rendered 2018-08-17 09:16:47 -04:00
Jeremy Bowman
8db01323b5 Fix some eslint warnings about global _ 2018-08-16 14:20:31 -04:00
mduboseedx
6bc8b4dcfa Merge pull request #18344 from open-craft/symbolist/navigation-for-anonymous-users 
Fixes for courseware anonymous access.
 2018-08-16 08:44:00 -04:00
Jeremy Bowman
713d64e1e2 TE-2702 Update Read the Docs links to HTTPS 2018-08-15 17:34:01 -04:00
Jolyon Bloomfield
9673db692d Fixing textline CSS issue 2018-08-14 20:40:51 -04:00
Jeremy Bowman
de7e2e18b7 Merge pull request #18776 from edx/jmbowman/TE-2526 
TE-2526 Remove dependency on needle and nose
 2018-08-14 16:31:45 -04:00
Calen Pennington
13a54b7046 Merge pull request #18750 from edx/cale/fix-educator-3262 
Render all parts of XBlock fragments in a Conditional Module
 2018-08-14 10:53:00 -04:00
Jeremy Bowman
fda571fedb TE-2526 Remove dependency on needle and nose 2018-08-13 16:21:47 -04:00
Michael Youngstrom
c58aac352c Fix commonlib-unit test collection errors 2018-08-13 12:40:53 -04:00
Calen Pennington
0aeec133fc Render all parts of XBlock fragments in a Conditional Module 
[EDUCATOR-3262]
 2018-08-10 13:32:55 -04:00
rabiaiftikhar
8286dcce88 EDUCATOR-3030 remove temperory logs 2018-08-10 10:46:29 +05:00
Jeremy Bowman
bcaec3c5bb TE-2525 nose.tools removal part 1/2 2018-08-07 08:30:12 -04:00