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

8492 Commits

Author SHA1 Message Date
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
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
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
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
Brittney Exline
ee1c3a4548 ENT-945 Update IDVerification interfaces to accountfor SSOVerification 2018-04-23 10:48:12 -04:00
Eric Fischer
062b04aee7 Merge pull request #17965 from edx/efischer/lti_take2 
pass context_title and _label to LTI provider
 2018-04-18 16:52:02 -04:00
Jeremy Bowman
28d291dce7 TE-2527 Move test and dev dependencies out of base.in 2018-04-18 14:44:31 -04:00
Eric Fischer
38f5358541 Revert "pass title/label to LTI consumers" 
This reverts commit f1fa7b8e06.
 2018-04-18 12:59:15 -04:00
Awais Jibran
bef0eb1135 updated correct map when new score is calculated 2018-04-18 15:13:25 +05:00
Mushtaq Ali
5a9477af30 Import video transcripts - EDUCATOR-2173 2018-04-16 12:05:44 +05:00
Michael Terry
a34c8c8233 Drop remaining coffee use 
This basically commits the transpiled CoffeeScript JS (with minor
cleanup) and removes coffee build support.

A tiny amount of support for xblocks exists, because external users
may have xblocks with coffee. But no coffee in our tree anyway.
 2018-04-13 14:10:40 -04:00
Michael Terry
2abbd1eb83 Move all our coffee files 
This moves the original files into their JS locations so that when
the next commit modifies them, we dont lose history.
 2018-04-13 14:10:40 -04:00
Michael Terry
4bd3033185 Update list of supported browsers 
Update the list of supported browsers in the example about page
template.
 2018-04-13 13:03:34 -04:00
Jeremy Bowman
9ca9aa44c6 PLAT-2060 Use pip-tools to manage requirements files (take 2) 
This reverts commit a7fa0c211d.
 2018-04-12 17:22:48 -04:00
Farhanah Sheets
c29682a6a5 Add alignment options to the TinyMCE platform plugin 2018-04-10 17:10:05 -04:00
Feanil Patel
a7fa0c211d Revert "PLAT-2060 Use pip-tools to manage requirements files" 2018-04-10 12:54:41 -04:00
Jeremy Bowman
432347b881 PLAT-2060 Use pip-tools to manage requirements files 2018-04-09 17:07:02 -04:00
Feanil Patel
c5b0a104d6 Merge pull request #17772 from edx/feanil/cleanup_pre 
Feanil/cleanup pre
 2018-04-09 13:17:26 -04:00
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
Peter Pinch
0419347adc remove physical constants and suffixes 
fix / remove old tests
 2018-03-21 13:02:57 -04:00
Eric Fischer
f1fa7b8e06 pass title/label to LTI consumers 2018-03-20 12:51:39 -04:00
Feanil Patel
041059f740 Update the other requirements to use pyparsing 2.2.0 as well. 2018-03-16 15:47:34 -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
Ned Batchelder
6bbb68ee1c Merge pull request #17370 from mitodl/pdpinch/tensor-variables 
Allow primes and tensor notation in variable names
 2018-03-05 15:32:48 -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
Ned Batchelder
0725e77674 Merge pull request #17372 from mitodl/pdpinch/catch-mismated-parens 
Add mismatched parenthesis detection to formula parsing
 2018-02-28 16:16:11 -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
Peter Pinch
ed90c80cca catch mismatched parens 2018-02-27 23:20:57 -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
Peter Pinch
54b85ddd13 allow prime and tensor notation 
fix epsilon_max test

add tests
 2018-02-14 16:06:43 -05:00
George Schneeloch
6aa87d43c0 Fix broken link in comment 2018-02-14 14:48:07 -05:00