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

47279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Holt
7f11a8bfa1 small change to test PR messaging on deployment 2018-09-11 13:41:22 -04: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
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
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
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
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
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
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
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
rabiaiftikhar
f3cc1d83fc EDUCATOR-3385 fix attribute error in discussion response notification 2018-09-04 23:10:57 +05:00
Qubad786
7f91655878 Update VAL release tag 2018-09-04 19:07:03 +05:00
irfanuddinahmad
527edc5c45 Add video thumbnails management command to scrape youtube thumbnails and update them in edxval 2018-09-04 19:07:03 +05:00
Qubad786
89925a96dc use waffle_flags from video pipeline and fix tests 2018-09-04 19:07:03 +05:00
Qubad786
e24438602d Deprecate youtube for existing courses by not sending course_video_upload_token to VEDA. 2018-09-04 19:07:03 +05:00
muhammad-ammar
809175d4cf add support to enable/disable hls as primary playback 
EDUCATOR-2714
 2018-09-04 19:07:03 +05:00
Mushtaq Ali
7698a277cd Scrape video thumbnails from youtube util - EDUCATOR-3109 2018-09-04 19:07:03 +05:00
Brandon Baker
565670323d Merge pull request #18851 from edx/bbaker/reveal-industry-pathways 
Reveal industry pathways in program details sidebar
 2018-09-04 09:30:13 -04:00
Waheed Ahmed
941c67d495 Merge pull request #18876 from edx/waheed/LEARNER-6313-fix-expire-entitlement-on-switching-session 
Fix entitlement expiring on switching session.
 2018-09-04 18:01:54 +05:00
Waheed Ahmed
711343a7c7 Fix entitlement expiring on switching session. 
LEARNER-6313
 2018-09-04 11:38:58 +05:00
asadiqbal
0dbdac3262 Unlink learner from Enterprise Customer when learner unlinks from IDP 2018-09-04 11:07:53 +05:00
edx-pipeline-bot
889e54846d Merge pull request #18873 from edx/release-mergeback-to-master 
Merge release back to master
 2018-08-31 20:37:20 -04:00
David Ormsbee
86b762d093 Merge pull request #18872 from edx/ormsbee/aurora_discussions_fix 
Change access pattern for role/permissions retrieval to address Aurora query optimizer.
 2018-08-31 17:03:30 -04:00
David Ormsbee
ebbd262710 Modify forum roles query for Aurora performance. 
This is a fix for the performance issues in EDUCATOR-3374

AWS's Aurora backend for MySQL selects the wrong index on the
django_comment_client_role_users table, leading to performance issues.
This commit replaces that join with individual requests for permissions
for each role (of which there may be several for any given user).
It's dumber SQL, but Aurora will do the right thing.
 2018-08-31 16:34:53 -04:00
Brandon Baker
171e95f904 Reveal professional pathways in program sidebar. 
Professional pathways are referred to as industry pathways in the code
to help differentiate them from professional certificate programs.
 2018-08-31 12:57:50 -04:00