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

47326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stu Young
0c2396a34b Merge pull request #18931 from edx/testeng/bokchoy_auto_cache_update_67075dab4603b6bf8974c4c8274c1e1afc7db301 
Bokchoy db cache update
 2018-09-13 11:46:29 -04:00
edx-cache-uploader-bot
b26863ce60 Updating migrations 2018-09-13 11:14:26 -04:00
Kevin Falcone
488c7f2d10 Merge pull request #18927 from edx/jibsheet/change-DOT-expiry-window 
Come down from 6 months to 3 months
 2018-09-13 11:08:44 -04:00
David Ormsbee
4057190435 Merge pull request #18808 from open-craft/opencraft/taranjeet/fix-child-course-display 
Fix incorrect course name displayed for CCX courses.
 2018-09-13 10:53:35 -04:00
Kevin Falcone
71859e8403 Come down from 6 months to 3 months 2018-09-13 10:39:22 -04: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
Michael Youngstrom
3c654234c9 Merge pull request #18922 from edx/youngstrom/timeout-test-change 
Bump timeout on sample_function_1 test
 2018-09-12 16:02:50 -04:00
J Eskew
7affa237df Merge pull request #18557 from mreyk/teltek/feature/improve-course-modes-configuration 
OSPR: Improve Course Modes configuration
 2018-09-12 15:52:48 -04:00
Robert Raposa
0cfda2d097 Merge pull request #18857 from edx/arch/consolidate-request-cached-decorator 
Cleanup and remove deprecated RequestCache Django app
 2018-09-12 15:11:29 -04:00
Michael Youngstrom
d5f9f2b35c Bump timeout on sample_function_1 test 2018-09-12 15:03:55 -04:00
Michael Youngstrom
0b94a373a5 Merge pull request #18919 from edx/youngstrom/paver-db-flakiness 
Subclass PaverTestCase in flaky paver db tests
 2018-09-12 14:44:14 -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
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
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