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

8543 Commits

Author SHA1 Message Date
Calen Pennington
b85d6f031c Merge pull request #18417 from cpennington/cale/fix-ora-webpack 
Cale/fix ora webpack
 2018-06-28 12:47:53 -04:00
Awais Jibran
b820c0c6f9 Merge pull request #18471 from edx/aj/fix-correct-map-problem 
Do not update correct_map if state is invalid (EDUCATOR-3016)
 2018-06-28 13:42:31 +05:00
Calen Pennington
07a15c681f Reapply the XBlock RequireJS -> Webpack changes 
This reverts commit 105db2cf59, reversing
changes made to 447457594f.
 2018-06-27 22:27:07 -04:00
Jeremy Bowman
e80152fd8a TE-2584 Upgrade XBlock to fix edx-sga warning 2018-06-27 10:16:51 -04:00
Awais Jibran
a8d6443df3 Do not update correctmap if state is invaid. 2018-06-27 17:54:39 +05:00
Feanil Patel
4e76a5d025 Merge pull request #18462 from edx/feanil/remove_beacon 
Get rid of all code related to the CDN Experiments.
 2018-06-26 10:47:38 -04:00
Feanil Patel
cd47b28339 Get rid of all code related to the CDN Experiments. 
These were very early experiments by the old performance team
on using CDNs for videos and logging performance data.  No one
is looking at this data and it's just extra cruft on every page.
 2018-06-25 18:03:33 -04:00
Usman Khalid
8b1aad080a Add complete on view support to render_xblock view. 2018-06-22 14:46:03 -04:00
John Eskew
b94ea6b4b1 Import XBlockMixin from the correct location. 2018-06-21 11:41:06 -04:00
Simon Chen
b273770934 Merge pull request #18213 from jolyonb/jolyonb/showanswer_on_attempts 
Allow solutions to be displayed past due on showanswer=attempted
 2018-06-20 09:37:42 -04:00
Eric Fischer
e72549cdbe Revert "Merge pull request #18340 from cpennington/fix-studio-xblock-rendering" 
This reverts commit 9a70ca78a5, reversing
changes made to efd5b9abbd.

Hopefully fixes EDUCATOR-3053
 2018-06-15 13:18:27 -04:00
Nimisha Asthagiri
62266fd936 Merge pull request #18325 from edx/hack/course-validation-api 
Course Validation and Course Quality APIs
 2018-06-13 21:33:22 -04:00
Nimisha Asthagiri
8db2dd47dd Course Validation and Course Quality APIs 2018-06-13 20:33:45 -04:00
Calen Pennington
b735a127b9 Fix assorted linting errors 2018-06-13 10:00:13 -04:00
Calen Pennington
be3c7e05c5 Reapply "Switch container factory to webpack" 
This reverts commit 18d93b00ba.
 2018-06-07 15:52:05 -04:00
Calen Pennington
18d93b00ba Revert "Switch container factory to webpack" 2018-06-07 13:46:47 -04:00
Calen Pennington
0abe75a7c6 Re-apply the changes to convert XBlocks to Webpack 
Reapplies edx/edx-platform#17509

This reverts commit 0f7e2373d0.
 2018-06-06 12:52:12 -04:00
Tyler Hallada
6e7f478402 Allow scrolling after insert/edit image in Studio 
The scroll lock class `modal-open` is removed from the body when the
EditImageModal is closed using the "Close" or "X" button, but not when the
"Insert Image" button is clicked. The submit button handler now calls the
`closeImageModal` handler too so that the `modal-open` class is removed after
inserting or editing an image.
 2018-06-04 12:31:04 -04:00
Calen Pennington
0f7e2373d0 Revert "Switch container factory to webpack" 2018-05-29 16:01:38 -04:00
Calen Pennington
5b8b23ff0c Consolidate location of word_cloud assets 2018-05-29 12:39:28 -04:00
Calen Pennington
b03f1422a0 Move word_cloud webpack build back into standard XModule configuration 2018-05-29 12:39:28 -04:00
Calen Pennington
070dab2b81 Convert WordCloudMain to an es6 class 2018-05-29 12:28:19 -04:00
Calen Pennington
667dbf1687 Clean up eslint failures 2018-05-29 12:28:19 -04:00
Calen Pennington
f557bad5a3 Wait for MathJax for tests, rather than MathJax.isReady 2018-05-29 12:19:05 -04:00
Calen Pennington
d08e199f79 Load XBlocks with webpack rather than RequireJS 2018-05-29 12:19:05 -04:00
Calen Pennington
94557900f8 Remove use of 'with' keyword from schematic.js 2018-05-29 12:19:05 -04:00
Calen Pennington
389f4fcec9 Switch container.js to bundle using webpack 2018-05-29 12:19:05 -04:00
Qubad786
f9476ab4ff Update old transcripts metadata present in video xml with the new transcripts for backward compatibility. 2018-05-25 21:29:26 +05:00
Daniel Clemente Laboreo
6d3f8150db Implement generate_report_data for capa problems 2018-05-24 22:09:58 +03:00
Peter Pinch
b5c9f8e862 fix tests 2018-05-18 22:31:47 -04:00
Jolyon Bloomfield
caedf6b444 Allow solutions to be displayed on showanswer=attempted if not attempted but past due 2018-05-16 12:56:42 -04:00
Tyler Hallada
8cf77f2382 Merge pull request #18205 from edx/thallada/sfe-modal-improvements 
Upgrade SFE, unscrollable body when modal is open.
 2018-05-15 16:40:49 -04:00
Tyler Hallada
e9a04939d9 Upgrade SFE, unscrollable body when modal is open. 2018-05-15 14:49:08 -04:00
Matthew Piatetsky
a394f23c12 mark units as graded if subsection is graded 2018-05-10 13:32:53 -04:00
muhammad-ammar
16e3d11354 download correct transcript content file 
EDUCATOR-2857
 2018-05-09 18:10:09 +05:00
Alex Dusenbery
0b11634e4c Run make upgrade to get latest version of xblock-lti-consumer (and others). 2018-05-07 13:35:30 -04:00
Mushtaq Ali
f4b1da1f42 Merge pull request #17718 from edx/transcripts-phase-2 
Transcripts phase 2
 2018-05-07 12:42:50 +05:00
attiyaishaque
0c4511b57d Fix that when usage key none is not raise error. 2018-05-04 12:29:25 +05:00
Stuart Young
1fd2167144 rebalance python unittests onto new shards 2018-05-03 11:16:05 -04:00
muhammad-ammar
c02955d025 add check transcript ajax for edx_video_id 2018-05-02 18:23:46 +05:00
Brittney Exline
91e63ed8e0 ENT-945 Using SSOVerifications in ID Verification flow 
This reworks what was done #17930, since it had to be reverted from the IDVerificationAggregate migration.
We decided to abandon that model and directly read from both id verification models.
 2018-04-30 11:57:59 -04:00
Muhammad Ammar
16b0070982 Merge pull request #17923 from edx/ammar/remove-video-transcript-enabled-flag 
remove video transcript enabled flag
 2018-04-30 17:35:14 +05:00
muhammad-ammar
aaaafee2b2 remove video transcript enabled flag 2018-04-30 15:59:32 +05:00
Ned Batchelder
6c3bd5d384 Merge pull request #17368 from mitodl/pdpinch/remove-constansts-and-suffixes 
Remove physical constants and suffixes from calc.py
 2018-04-26 16:54:25 -04:00
Cory Lee
a2d33979ce Merge pull request #18068 from edx/release-mergeback-to-master 
Merge release back to master
 2018-04-26 16:02:56 -04:00
Jeremy Bowman
3851a645bb Merge pull request #18041 from edx/jmbowman/TE-2528 
TE-2528 Upgrade testing dependencies
 2018-04-26 15:34:16 -04:00
Eric Fischer
8ed427e9f5 cache list of partitions in a course 2018-04-26 13:10:19 -04:00
irfanuddinahmad
bfbeeb1d84 added exception decorator 2018-04-26 16:02:09 +05:00
Jeremy Bowman
9477ad23d1 TE-2528 Upgrade testing dependencies 2018-04-25 16:37:29 -04:00
Brittney Exline
292f9ca831 Partial revert of "ENT-945 Update IDVerification interfaces to accountfor SSOVerification" 
This partially reverts commit ee1c3a4548.
The migration files introduced by the commit have been kept since they have been run
already on several enviornments.
 2018-04-25 16:01:15 -04:00