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

49248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Agha Awais
9a8cb4439c Merge pull request #18886 from edx/awais/lett_2_bc_grading_III 
added back add_assignment_type
 2018-09-07 15:30:17 +05:00
Calen Pennington
41c71505e3 Load all webpack chunks into fragments as correctly-typed resources 2018-09-06 15:47:13 -04:00
Bill Filler
e14f70035e Merge pull request #18888 from edx/bfiller/journal-frontend-config 
Support for separate Journals frontend app
 2018-09-06 15:14:12 -04:00
Bill Filler
a8b1fee847 Add support for Journals frontend app 2018-09-06 14:20:45 -04:00
Michael Youngstrom
c8b4ca6bf4 Merge pull request #18848 from edx/youngstrom/clear-dark-lang-db 
Clear cache after tests that create DarkLangConfig objects
 2018-09-06 12:11:35 -04:00
Michael Youngstrom
bc1d883e1a Dont let DarkLangConfig cache interfere with other tests 2018-09-06 10:33:54 -04:00
Asad Iqbal
655d6abea8 Merge pull request #18745 from edx/asadiqbal08/ENT-769 
[ENT-769] - Unlink learner from Enterprise Customer
 2018-09-06 15:02:50 +05:00
Jeremy Bowman
62a08a0e27 Merge pull request #18860 from mitodl/pdpinch/bump-edx-sga 
bump edx-sga to 0.8.3
 2018-09-06 09:08:36 +00:00
Robert Raposa
7e2c08e6b4 Merge pull request #18890 from edx/robrap/remove-flaky-video-test 
EDUCATOR-3417: Remove flaky video test.
 2018-09-05 16:42:46 -04:00
Robert Raposa
6f835e408f Merge pull request #18891 from edx/robrap/remove-flaky-completion-test-2 
EDUCATOR-3418: Remove flaky completion test.
 2018-09-05 16:42:19 -04:00
Robert Raposa
366486fc6a Remove flaky completion test. 
* test_render_xblock_publish_completion_is_sent_on_view
 2018-09-05 14:40:51 -04:00
Robert Raposa
69204d5a61 Remove flaky video test. 
* test_video_language_menu_working
 2018-09-05 14:36:11 -04:00
Brandon Baker
07ef68ef09 Fix event tracking for pathway buttons. 
Switches to tracking pathway_uuid to match the original event proposal.

LEARNER-6087
 2018-09-05 12:30:16 -04:00
Robert Raposa
5b49a8e926 Merge pull request #18887 from edx/robrap/remove-flaky-completion-test 
EDUCATOR-3409: Remove flaky completion test.
 2018-09-05 11:48:20 -04:00
tasawernawaz
cc51494910 Fix for duplicate email validation on account settings page 
LEARNER-6216
 2018-09-05 20:05:55 +05:00
Robert Raposa
d3d270f829 Remove flaky completion test. 
* test_courseware_publish_completion_is_sent_on_view
 2018-09-05 11:01:37 -04:00
Calen Pennington
139d40b76b Merge pull request #18854 from cpennington/cale/edu-3262-logging 
Log conditional xblock fragment resource loading
 2018-09-05 10:40:49 -04:00
Agha Awais
783bac941b added back add_assignment_type 2018-09-05 14:37:02 +00:00
edx-pipeline-bot
ba2f1ca272 Merge pull request #18881 from edx/private_to_public_06d4044 
Mergeback PR from private to public.
 2018-09-04 17:04:36 -04:00
Farhanah Sheets
06d4044696 Merge pull request #145 from edx/fsheets/EDUCATOR-3346 
Update recommender-xblock version number
 2018-09-04 16:15:35 -04:00
Diana Huang
755ebc8c7f Send program cert visible_date 
When sending a program cert to Credentials, also send along a
calculated visible_date along with it.

LEARNER-6262
 2018-09-04 16:05:24 -04:00
Rabia Iftikhar
05debb8d54 Merge pull request #18867 from edx/ri/EDUCATOR-3385-attribute-error 
EDUCATOR-3385 fix attribute error in discussion email notification
 2018-09-04 23:47:43 +05:00