Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,810 Commits 1 Branch 0 Tags
5c4c3d075356fa7c0bff092f2f56792efeabfbaa
Commit Graph

48810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Roytman
5c4c3d0753 Merge pull request #19948 from edx/mroytman/EDUCATOR-4083-min-price-masters-course-mode 
allow configurability of the minimum price for a course mode
 2019-03-06 16:03:35 -05:00
Cali
5ec3ab2068 Merge pull request #19946 from edx/cstenson/delete_flaky_tests 
Delete flaky bokchoy tests.
 2019-03-06 14:56:47 -05:00
Michael Roytman
c8b4f7e779 allow configurability of the minimum price for a course mode 2019-03-06 14:26:00 -05:00
Cali Stenson
362403bf7a Delete flaky bokchoy tests. 
EDUCATOR-4164, EDUCATOR-4165, EDUCATOR-4166
 2019-03-06 14:20:18 -05:00
Matt Hughes
957fdd8360 Merge pull request #19937 from edx/matthugs/shore-up-whitespace-on-proctoring-instructions-page-for-PSI-exams 
Shore up whitespace on proctoring instructions page for PSI exams
 2019-03-06 13:48:01 -05:00
Calen Pennington
7613d60cf3 Merge pull request #19893 from cpennington/cale/fbe-access-expiry-reminder 
REVMI-95: Cale/fbe access expiry reminder
 2019-03-06 13:09:24 -05:00
Calen Pennington
4c8cd60bbc REVMI-96: Add a management command to experiment with Access Expiry reminder emails for FBE 2019-03-06 11:44:29 -05:00
Calen Pennington
300c3a34dd Don't swallow exceptions inside emulate_http_request 2019-03-06 11:44:29 -05:00
Calen Pennington
6f61fd74f5 Add an implementation of the stable bucketing function 2019-03-06 11:44:29 -05:00
Matt Hughes
e0e7a5ec61 Shore up whitespace on proctoring instructions page for PSI exams 
JIRA:EDUCATOR-4105
 2019-03-06 11:38:54 -05:00
Cali
81538fe25b Merge pull request #19851 from edx/cstenson/dashboard_metadata 
Add price information to enrollments and create dashboard_metadata
 2019-03-06 11:04:18 -05:00
Troy Sankey
a50a1539e1 Merge pull request #19933 from edx/pwnage101/remove-one-off-rehash-mgmt-commmands-plat-2288 
Remove one-off management commands to rehash retired emails/usernames
 2019-03-06 10:55:43 -05:00
Stu Young
bd8e1adfcc Merge pull request #19932 from edx/estute/remove-flaky-bokchoy-test 
remove flaky bokchoy test
 2019-03-06 10:07:04 -05:00
Christie Rice
6195e3e6ed Merge pull request #19939 from edx/crice/REVEM-219_programs 
REVEM-219 Get program info even if user isn't yet enrolled in the course
 2019-03-06 10:05:10 -05:00
adeelehsan
58812f2c67 Merge pull request #19926 from edx/aehsan/LEARNER-6943/caching_full_response_instead_of_fields 
Caching full response
 2019-03-06 19:13:34 +05:00
Awais Jibran
e76536b671 Merge pull request #19943 from edx/aj/fix-cert-invalid-grade-source 
Fix Incorrect data for cert table
 2019-03-06 19:13:06 +05:00
adeelehsan
82a34c002f Caching full response 
cache full response regardless
of fields given or not. Reason
for doing this to avoid cache
overridden. For some courses
get_user_course_expiration_date
was overriding certificate template
cache in render_html_view

Learner-6943
 2019-03-06 18:23:55 +05:00
noraiz-anwar
d55be49e64 add back off for failing recurrent requests 2019-03-06 16:52:35 +05:00
Awais Jibran
81f1526786 Fix Incorrect data in the database table certificates_generatedcertificate propagation. 
EDUCATOR-4128
 2019-03-06 15:13:52 +05:00
Christie Rice
df1ac42d0a REVEM-219 Get program info even if user isn't yet enrolled in the course 2019-03-05 20:53:24 -05:00
Matthew Piatetsky
11e1631919 Merge pull request #19935 from edx/REVMI-93 
REVMI-93 stop ignoring enrollment creation date if the user is masquerading
 2019-03-05 17:16:16 -05:00
Cali Stenson
7e6147f714 Add price information to enrollments and create dashboard_metadata 
for experiments.

REVEM-174
 2019-03-05 16:55:04 -05:00
Troy Sankey
2b28396890 Remove one-off management commands to rehash retired emails/usernames 
PLAT-2288
 2019-03-05 16:28:51 -05:00
Matthew Piatetsky
fd00ce1d0b stop ignoring enrollment creation date if the user is masquerading 2019-03-05 16:05:17 -05:00
Cory Lee
07d81bf297 Merge pull request #19913 from edx/coryleeio/yaml_config 
Use single yaml config instead of two json configs.
 2019-03-05 14:25:52 -05:00
Stuart Young
a79e064192 remove flaky bokchoy test 2019-03-05 13:47:17 -05:00
Audrey
e5f6aac5cd Merge pull request #19930 from edx/aekao/REVEM-151/entitlement-unenrollment-JSON 
Inserting JSON string into Vertica instead of JSON obj
 2019-03-05 13:05:03 -05:00
Audrey Kao
bc53cddcca Inserting JSON string into Vertica instead of JSON obj 2019-03-05 12:00:46 -05:00
Cory Lee
2108b69ff1 "Use single yaml config instead of two json configs" 
This reverts commit 8c805999e6.
 2019-03-05 11:27:36 -05:00
Matthew Piatetsky
e264549eaf Merge pull request #19922 from edx/REVMI-108 
[REVMI-108] stop bucketing new users into FBE holdback
 2019-03-05 11:17:49 -05:00
Dave St.Germain
bab70bd10d Merge pull request #19909 from edx/dcs/upgrade-proctoring 
Upgraded edx-proctoring to 1.5.17
 2019-03-05 09:33:01 -05:00
Douglas Hall
8676d88528 Merge pull request #19924 from edx/douglashall/add_jwt_auth_to_pref_api 
Add JwtAuthentication to user preferences API.
 2019-03-05 09:18:51 -05:00
DawoudSheraz
de8d0f6ba1 Merge pull request #19888 from edx/dsheraz/educator_3982 
patch video player speed adjustments
 2019-03-05 18:44:07 +05:00
Matthew Piatetsky
b22c453a4a stop bucketing new users into FBE holdback 2019-03-05 08:16:04 -05:00
DawoudSheraz
a5fe66863e fix video player speed adjustments 2019-03-05 17:37:33 +05:00
Nimisha Asthagiri
75161e1140 Merge pull request #19925 from edx/douglashall/add_jwt_auth_to_prof_image_api 
Add JwtAuthentication to user profile image API.
 2019-03-04 18:23:27 -05:00
Douglas Hall
e442d2cf3e Add JwtAuthentication to user profile image API. 2019-03-04 17:42:29 -05:00
Douglas Hall
724894d736 Add JwtAuthentication to user preferences API. 2019-03-04 17:14:29 -05:00
David Ormsbee
12b1fe0263 Merge pull request #19921 from edx/revert-19917-ormsbee/ora2-2.2.2 
Revert "Bump ORA2 dependency to 2.2.2"
 2019-03-04 15:55:58 -05:00
David Ormsbee
ce94799097 Revert "Bump ORA2 dependency to 2.2.2" 2019-03-04 14:47:13 -05:00
Mike Dikan
2fc27a9caa Merge pull request #19693 from edx/mdikan/hackathon-21 
Removal of deprecated external auth.
 2019-03-04 13:48:57 -05:00
Feanil Patel
c8ebcff16b Merge pull request #19908 from edx/feanil/remove_flaky_bokchoy_test 
Remove a flaky bokchoy test.
 2019-03-04 10:57:07 -05:00
David Ormsbee
798ffb2bd4 Merge pull request #19917 from edx/ormsbee/ora2-2.2.2 
Bump ORA2 dependency to 2.2.2
 2019-03-04 10:30:11 -05:00
Dave St.Germain
ac6c89553c Upgraded edx-proctoring to 1.5.17 2019-03-04 10:19:08 -05:00
Waheed Ahmed
499abab7ad Merge pull request #19918 from edx/waheed/LEARNER-6643-return-credit-status-error 
Return credit status error if no provider info found.
 2019-03-04 17:27:44 +05:00
Waheed Ahmed
dbad75467e Return credit status error if no provider info found. 
Return credit status error if no provider info found in provider info by
id dict. Also add logs to get an idea what is in this dict.

LEARNER-6643
 2019-03-04 15:59:55 +05:00
David Ormsbee
72452d60b4 Bump ORA2 dependency to 2.2.2 2019-03-03 16:39:16 -05:00
edX Transifex Bot
4a9a515419 Update translations 2019-03-03 16:23:47 -05:00
Mike Dikan
2c149ca6be Removing the Deprecated the 'external_auth' package in favor of 'third_party_auth' which is the current recommendation. 2019-03-02 16:06:46 -05:00
Usama Sadiq
2599229995 Merge pull request #19891 from edx/usama/progress_page_update_for_unverified_user 
Progress Page update
 2019-03-02 08:45:23 +05:00