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
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
David Ormsbee
15b845a881 Merge pull request #19907 from edx/ormsbee/increment-dependencies 
Update edx-platform dependencies.
 2019-03-01 17:44:43 -05:00
Cory Lee
e09a878de3 Merge pull request #19912 from edx/coryleeio/revert_yaml_config_pr 
Reverting because workers are not functioning because they do not source the application environment. Will fix this separately and then try again.
 2019-03-01 17:32:41 -05:00
Cory Lee
8c805999e6 Revert "Use single yaml config instead of two json configs" 
This reverts commit b0b8a76dd9.
 2019-03-01 17:31:10 -05:00
David Ormsbee
aa4f21ea43 Update edx-platform dependencies. 
Extra constraints needed to be added for pytest-randomly and tornado,
both of which have dropped Python 2 support.
 2019-03-01 15:59:00 -05:00
Douglas Hall
f07f9b6d91 Merge pull request #19884 from edx/douglashall/course_certificate_list_api 
Add list endpoint to course certificate API.
 2019-03-01 15:55:26 -05:00
Douglas Hall
8373298149 Add list endpoint to course certificate API. 2019-03-01 14:48:00 -05:00
Jeremy Bowman
39a28d2586 TE-2871 Switch to mysqlclient 2019-03-01 14:34:13 -05:00
Feanil Patel
25a043e17c Remove a flaky test. 
Failing Build: https://build.testeng.edx.org/job/edx-platform-bokchoy-pipeline-pr/2061/
Passing Build: https://build.testeng.edx.org/job/edx-platform-bokchoy-pipeline-pr/2051/

The test passes in 2051 but then fails in build 2061 for the same
commit.
 2019-03-01 14:31:10 -05:00
Feanil Patel
d9cfd19459 Delete flaky test. 
Failing Build: https://build.testeng.edx.org/job/edx-platform-bokchoy-pipeline-pr/2051/
Passing Build: https://build.testeng.edx.org/job/edx-platform-bokchoy-pipeline-pr/2061/

This test fails on build 2051 and passes on 2061 but both builds are for
the same commit.
 2019-03-01 14:28:32 -05:00
Audrey
7fc5a66642 Merge pull request #19894 from edx/aekao/REVEM-151/entitlement-unenrollment-survey 
Modifying entitlement unenrollment survey, see REVEM-151
 2019-03-01 14:26:23 -05:00
Cory Lee
ff1c087b9d Merge pull request #19886 from edx/coryleeio/yaml_config 
Use single yaml config instead of two json configs
 2019-03-01 13:39:19 -05:00
Christie Rice
72308f6789 Merge pull request #19879 from edx/crice/REVEM-198_realPrograms 
REVEM-198 Add waffle flag around get programs call. Also get real program info from the cache instead of returning mock data.
 2019-03-01 13:33:14 -05:00
Cory Lee
b0b8a76dd9 Use single yaml config instead of two json configs 2019-03-01 12:55:40 -05:00
Audrey Kao
9adeeda90f More eslint issues 2019-03-01 11:51:50 -05:00
Feanil Patel
49784dc36c Remove a flaky bokchoy test. 
This test failed and then passed for edx-platform commit: 9b358aaffc

Failed Build: https://build.testeng.edx.org/job/edx-platform-bokchoy-pipeline-master/351/
Passing Build: https://build.testeng.edx.org/job/edx-platform-bokchoy-pipeline-master/352/
 2019-03-01 11:29:22 -05:00
Michael Youngstrom
8a8dcd4c5c Merge pull request #19904 from edx/youngstrom/fix-xdist-checkout-issues 
Change git checkout on xdist workers
 2019-03-01 10:27:42 -05:00
Usama
a826145d91 Progress Page update 
Updated progress page certificate view for
unverified users.
 2019-03-01 12:47:37 +05:00
Matt Tuchfarber
eec95cf538 Add discussion api 2019-02-28 16:35:09 -05:00
Audrey Kao
d4730dc4b0 Addressing more eslint issues 2019-02-28 16:17:05 -05:00
David Ormsbee
9b358aaffc Merge pull request #19903 from edx/revert-19635-giovanni/bb-728-add-problem-response-report-api-upstream 
Revert "[BB-728] Add problem response report API"
 2019-02-28 14:44:33 -05:00
Michael Youngstrom
b1695b4966 Change git checkout on xdist workers 2019-02-28 14:10:35 -05:00
Ned Batchelder
989a939654 Merge pull request #19885 from eduNEXT/lmm/courselanguage 
Set the default language of the courses through config files
 2019-02-28 13:41:44 -05:00
David Ormsbee
8f65ab53f0 Revert "[BB-728] Add problem response report API" 2019-02-28 13:10:31 -05:00