Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

18841 Commits

Author SHA1 Message Date
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
Alessandro Roux
fd48e3848e Merge pull request #17418 from edx/resume-button-on-dashboard 
EDUCATOR 2190: Course card resume buttons on the student dashboard.
 2018-03-02 15:59:41 -05:00
sandroroux
3f22ce3031 These changes add a resume button to course cards on the student dashboard. 2018-03-02 14:52:30 -05:00
Michael Terry
c9318c3e51 Convert learner_dashboard to es2015 2018-03-02 08:57:34 -05:00
Tyler Hallada
c3ecc8b4bb Merge pull request #17562 from edx/thallada/EDUCATOR-2419 
EDUCATOR-2419 No upgrade deadline for professional courses
 2018-03-01 13:22:41 -05:00
Jeremy Bowman
2bb4e51eba Merge pull request #17561 from edx/jmbowman/PLAT-1976 
PLAT-1976 Add waffle switch to block auth_user write attempts
 2018-02-28 17:16:56 -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
Jeremy Bowman
b3ac2b1b06 PLAT-1976 Add waffle switch to block auth_user write attempts 2018-02-28 13:13:06 -05:00
Calen Pennington
49790d2dd3 Merge pull request #17576 from edx/revert-17565-re-add-asset-index-changes 
Revert "Revert "Revert "Merge pull request #17325 from cpennington/switch-ass…"
 2018-02-28 12:09:18 -05:00
Farhanah Sheets
d088e584e1 Merge pull request #17546 from edx/mroytman/bok-choy-sfe-assets 
Bok Choy tests for studio-frontend assets page
 2018-02-28 12:03:09 -05:00
Calen Pennington
c45de5c32b Revert "Revert "Revert "Merge pull request #17325 from cpennington/switch-ass…" 2018-02-28 11:06:39 -05:00
Michael Roytman
90bcd273a0 add ConfigurationModelFixture for Studio Frontend Assets Page and add Bok Choy tests for Studio Frontend Assets Page 2018-02-28 10:48:27 -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
Tyler Hallada
8fb26258e4 Add a regression test 2018-02-27 16:25:41 -05:00
Calen Pennington
b1c9ad175d Revert "Revert "Merge pull request #17325 from cpennington/switch-asset-index-factory-to-webpack"" 
This reverts commit 67177ac72d.

The original PR cause a breakage on production due to webpack building two different
copies of the asset_index.js bundle. However, it is unclear whether that was a
transitory issue or not. This commit restores the original PR to validate whether
the problem is reproducible.
 2018-02-27 16:18:27 -05:00
Tyler Hallada
c5cbbdf72e No dynamic_upgrade_deadline in prof. courses 2018-02-27 14:30:04 -05:00
Eric Fischer
e0557931a7 Merge pull request #17471 from edx/efischer/sfe_use_i18n 
provide data to SFE in DOM
 2018-02-27 12:17:30 -05:00
Alex Dusenbery
05319ab516 Fixup logging statement for randomized blocks. 2018-02-27 10:28:07 -05:00
Eric Fischer
2717ef5b80 Provide i18n data to SFE in DOM 
EDUCATOR-1613, edx-platform changes
 2018-02-27 10:17:35 -05:00
Peter Pinch
9ee7ef1acf reduce escaping on sandbox errors returned to learners 2018-02-26 21:51:55 -05:00
Bill DeRusha
9abec119fc Merge pull request #17503 from edx/bderusha/sp-cleanup 
Removed self-paced feature flag from code
 2018-02-26 14:42:53 -05:00
Bill DeRusha
d4b57bc218 Removed self-paced feature flag from code 2018-02-26 13:44:53 -05:00
Feanil Patel
f6d3421751 Revert "Update setup.py for calc module." 2018-02-23 16:53:41 -05:00
Feanil Patel
d51718c47b Merge pull request #17538 from edx/feanil/fix-version-conflict 
Update setup.py for calc module.
 2018-02-23 15:32:46 -05:00
George Babey
3e840ff268 Merge pull request #17497 from edx/gbabey/move_paginators 
Moved pagination to edx_rest_framework_extensions package
 2018-02-23 15:24:40 -05:00
George Babey
1c7720a561 Bump drf-extensions for pagination move 2018-02-23 14:20:00 -05:00
Feanil Patel
c0b5916804 Update setup.py for calc module. 
We've been running with pyparsing 2.2.0 in production this whole time
so I'm pretty sure we can depend on this.
 2018-02-23 14:02:54 -05:00
John Eskew
b292bb43eb Merge pull request #17446 from mitodl/upstream/fix_error_page_themes 
Fixed unthemed error pages in Studio and LMS
 2018-02-23 13:25:08 -05:00
Albert (AJ) St. Aubin
312a9ec160 Merge pull request #17533 from edx/aj/LEARNER-3898 
Added entitlement redeemability method to the check for fulfillable
 2018-02-23 07:44:46 -05:00
edx-pipeline-bot
92ca38f489 Merge pull request #17535 from edx/release-mergeback-to-master 
Merge release back to master
 2018-02-22 18:32:36 -05:00
Gavin Sidebottom
67442c2641 Fixed unthemed error pages in Studio and LMS 2018-02-22 16:49:06 -05:00
Albert St. Aubin
8c5e37ba20 Added entitlement redeemability method to the check for fulfillable 
entitlements

[LEARNER-3898]
 2018-02-22 15:00:19 -05:00
Calen Pennington
67177ac72d Revert "Merge pull request #17325 from cpennington/switch-asset-index-factory-to-webpack" 
This reverts commit 1c46bd89c3, reversing
changes made to eb6064e333.
 2018-02-22 14:12:32 -05:00
Dennis Jen
b9d6ead3a3 Merge pull request #17522 from edx/dsjen/rename-accessibility-switch 
Renamed contentstore waffle namespace to "studio"
 2018-02-22 11:10:57 -05:00
Matthew Piatetsky
518ab054b3 Merge pull request #17475 from edx/default_unified_course_tab_to_on 
LEARNER-3605: make unified_course_tab on by default
 2018-02-22 10:30:12 -05:00
Diana Huang
972af9ef56 Merge pull request #17520 from edx/diana/remove-flaky-test 
LEARNER-3605: Remove flaky studio test.
 2018-02-22 09:56:48 -05:00
Matthew Piatetsky
92c94008a2 Fix tests that expected unified_course_tab to be off 2018-02-22 08:45:25 -05:00
Albert (AJ) St. Aubin
7484c1b135 Merge pull request #17491 from edx/aj/LEARNER-3898 
Aj/learner 3898
 2018-02-21 20:45:08 -05:00
Dennis Jen
354abd09c8 Renamed contentstore waffle namespace to "studio" 2018-02-21 17:26:05 -05:00
Brian Mesick
714b25a83d Merge pull request #17480 from open-craft/ciuin/fix-user-creation-mgmtcmds 
Fix user creation management commands
 2018-02-21 15:55:09 -05:00
Diana Huang
a634c076ba Remove flaky studio test. 2018-02-21 14:59:52 -05:00
Calen Pennington
1c46bd89c3 Merge pull request #17325 from cpennington/switch-asset-index-factory-to-webpack 
Switch asset index factory to webpack
 2018-02-21 11:48:37 -05:00
Albert St. Aubin
b56fdcc652 Changes to auto enroll users using their entitlement if they have one 
available.

[LEARNER-3898]
 2018-02-21 11:17:02 -05:00
Matthew Piatetsky
6a841d5b2b Merge pull request #17494 from edx/limit_enrollment_count 
limit bundling code to users with less than 4 enrollments
 2018-02-21 11:10:21 -05:00
Calen Pennington
c906c186ce Move the context course and sock into require_page compatible forms 2018-02-21 10:29:41 -05:00
Alex Dusenbery
919355cab1 Revert "Track viewing of individual blocks." 
This reverts commit 4946b6b296.
 2018-02-20 14:42:28 -05:00
Michael LoTurco
449c6903a6 Add Support endpoint for Course Entitlements 2018-02-20 13:20:47 -05:00
Matthew Piatetsky
70ec5e47c6 limit bundling code to users with less than 4 enrollments 2018-02-16 14:24:23 -05:00