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

53520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
db2078ed2f fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-12 14:27:54 -04:00
Stu Young
53d8a04b88 Merge pull request #18921 from edx/estute/bump-npm-installation-timeouts 
increase npm installation timeouts
 2018-09-12 14:27:14 -04:00
Stuart Young
c7ece71142 increase npm installation timeouts 2018-09-12 14:20:12 -04:00
Brian Mesick
f9de1f1927 Merge pull request #18911 from edx/bmedx/add_unretire_button 
Add admin UI to cancel pending retirements
 2018-09-12 13:38:44 -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
Michael Youngstrom
ff7431a161 Add in PaverTestCase to flaky paver db test class 2018-09-12 12:15:48 -04:00
Stu Young
bbc1cc9fcb Merge pull request #18878 from edx/testeng/bokchoy_auto_cache_update_4b964c58e34263236d695b1e89e8ea1941e5e87e 
Bokchoy db cache update
 2018-09-12 11:54:09 -04:00
mrey
9003a2dcde Allow to override COURSE_ENROLLMENT_MODES in AWS environment 
Add more parameters to COURSE_ENROLLMENT_MODES to allow to display friendly mode name and more options

Fix python tests of PR #18557

PR #18557: Fix Diff Quality test line too long

PR #18557: Fix Diff Quality test unused-variable

Use six.iteritems() in COURSE_MODE_SLUG_CHOICES for future Python 3 compatibility
 2018-09-12 17:35:57 +02:00
edx-cache-uploader-bot
33e2e943bc Updating migrations 2018-09-12 11:20:37 -04:00
Taranjeet Singh
6931c3b7e1 Fix incorrect course name displayed for CCX courses. 
This commit updates the course name for CCX course at Info, Course
and Instructor tabs.
 2018-09-12 18:49:21 +05:30
Bill Filler
3e146b7af3 Merge pull request #18738 from edx/hasnain-naveed/WL-1687 
WL-1687 | Added access check for journal xblock videos
 2018-09-11 15:44:32 -04:00
Cory Lee
88e32c57b2 Merge pull request #18914 from edx/bjh/test-PR-messaging 
small change to test PR messaging on deployment
 2018-09-11 14:14:59 -04:00
Awais Jibran
9cec43afb7 Merge pull request #18842 from edx/aj/fix-checklist-for-edge 
Fix edge checklist 500 error.
 2018-09-11 23:05:41 +05:00
Calen Pennington
9c32073e9b fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-11 13:56:05 -04:00
Ben Holt
7f11a8bfa1 small change to test PR messaging on deployment 2018-09-11 13:41:22 -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
Farhanah Sheets
fa9c4ca31d Merge pull request #18910 from edx/fsheets/recommender-3 
Bump RecommenderXBlock version
 2018-09-11 10:25:33 -04:00
Saleem Latif
d85c9a944b Merge pull request #18913 from edx/saleem-latif/ENT-1211 
ENT-1211: Version bump for edx-enterprise.
 2018-09-11 18:51:37 +05:00
Saleem Latif
d8f11c8627 Version bump for edx-enterprise. This version contains a fix for enterprise customer admin screen 500 error. 2018-09-11 17:58:19 +05:00
hasnain-naveed
d8eca3f299 WL-1687 | Added journals access in xblock rendering 2018-09-11 17:15:54 +05:00
asadazam93
0ec8e38422 Fixed download transcript 500 error 2018-09-11 16:04:35 +05:00
Agha Awais
719aa4c5cb Merge pull request #18909 from edx/awais/lett_2_bc_grading_III 
Grading bokchoy tests III
 2018-09-11 11:06:46 +05:00
Braden MacDonald
6c599cc153 Merge pull request #18855 Output a list of replaced static paths 2018-09-10 20:03:59 -07:00
Usman Khalid
ca910b6f27 Collect static asset URLs from static_replace.replace_static_urls 
Allows users to keep track of which static asset URLs were found in given text,
and what they were replaced from/to.
 2018-09-11 11:16:33 +09:30
Farhanah Sheets
5c3c0f0fcb Edit test value to be valid URL format 2018-09-10 20:21:56 -04:00
bmedx
405a8ada59 Add admin UI to cancel pending retirements 2018-09-10 16:37:13 -04:00
Farhanah Sheets
1fcf2a0bd7 Bump RecommenderXBlock version 2018-09-10 15:59:09 -04: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
Agha Awais
6c45b236ab Grading bokchoy tests III 2018-09-10 19:39:53 +00:00
Calen Pennington
cb075a3240 fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-10 15:09:34 -04:00
Calen Pennington
b36aa292dd fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-10 14:10:29 -04:00
Calen Pennington
493bbe9310 DO NOT MERGE: debug logging to figure out why libraries won't load 2018-09-10 12:43:04 -04:00
Ned Batchelder
f51cfc1a88 Explain the pytest-cov pin 2018-09-10 11:30:06 -04:00
Ned Batchelder
e5f5f50a1c Always use parallel for coverage measurement 2018-09-10 11:29:54 -04:00
bmedx
fdc739cea6 Clean up UserRetirementStatus admin 2018-09-10 10:33:56 -04:00
Ned Batchelder
45a0b549b1 Merge pull request #18837 from shadinaif/ddt-upgrade-INCR-6 
Upgrade the ddt package to a version supports Python 3
 2018-09-10 08:58:07 -04:00
Awais Jibran
84b6494262 revert package.json 2018-09-10 17:22:11 +05:00
Awais Jibran
3bb34faa8f Fix edge checklist 500 error 
EDUCATOR-3355
 2018-09-10 16:30:13 +05:00
shadinaif
80039ab028 This is to upgrade the ddt package from the old 0.8.0 version to the latest version that supports Python3 
(version 1.2.0 as of this commit)

This commit is intended to close INCR-6 issue (see https://openedx.atlassian.net/browse/INCR-6 )
 2018-09-10 11:33:05 +03:00
Robert Raposa
71161b8eda Merge pull request #18879 from edx/revert-revert-18861-robrap/ARCH-223-replace-request-cache 
ARCH-223: Revert the revert of Replace Request Cache
 2018-09-08 16:30:37 -04:00
Robert Raposa
ba4cc62ff8 Retire deprecated RequestCache (Take 2) 
ARCH-223
 2018-09-08 15:09:28 -04:00
Braden MacDonald
b603f3cf60 Merge pull request #18856: Convert DATA_DIR to a Path object 2018-09-07 15:26:31 -07:00
Alex Dusenbery
34199d9e98 Don't join to auth_user when getting verified user ids; use them in a set and not a list. 2018-09-07 11:59:46 -04:00
Brandon Baker
88c47561f2 Merge pull request #18885 from edx/bbaker/fix-pathway-eventing 
Fix event tracking for pathway buttons.
 2018-09-07 11:53:52 -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
Stu Young
4a60680387 Merge pull request #18830 from edx/estute/TE-2680 
log npm installation on jenkins
 2018-09-07 09:25:12 -04:00
Calen Pennington
e6f11072b0 fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-07 09:24:35 -04:00
Stuart Young
0dd13fad1b add paver timeout decorator and npm installation logs 2018-09-07 08:46:04 -04:00