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

47631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
irfanuddinahmad
f6fd2ffa7a Version bump for edx-enterprise to 1-0-2 2018-10-25 19:37:39 +05:00
Alex Dusenbery
b3c31535de EDUCATOR-3609 | Make the course grade API response paginated. 2018-10-24 13:16:14 -04:00
Douglas Hall
8c9b505326 Merge pull request #19150 from edx/douglashall/fix_jwt_cookie_middleware_order 
JwtAuthCookieMiddleware needs to come before AuthenticationMiddleware.
 2018-10-24 10:54:23 -04:00
Douglas Hall
8bcd5fd785 JwtAuthCookieMiddleware needs to come before AuthenticationMiddleware. 2018-10-24 10:19:36 -04:00
Dillon-Dumesnil
fbb5e6c99c Merge pull request #19139 from edx/ddumesnil/entitlements-email-opt-in 
Adding email opt in to create entitlement
 2018-10-24 09:50:12 -04:00
emma-green
1cda241197 Merge pull request #19121 from edx/emma-green/EDUCATOR-3569/fix-programs-with-old-course_runs 
catch-programs-with-old-course-runs
 2018-10-24 09:42:44 -04:00
Douglas Hall
3bef75aae3 Merge pull request #19147 from edx/douglashall/jwt_auth_cookie_setting 
Add JWT_AUTH_COOKIE setting to enable JwtAuthentication on DRF API endpoints.
 2018-10-24 09:01:34 -04:00
Attiya Ishaque
cc1898d189 Merge pull request #19144 from edx/ai/EDUCATOR-3581-discussion-loading-profile 
Fix that discussions are loading in the profile view.
 2018-10-24 17:28:13 +05:00
Dillon Dumesnil
ac43d5faac Adding email opt in to create entitlement 2018-10-23 17:33:30 -04:00
Douglas Hall
818bcc509c Add JWT_AUTH_COOKIE setting to enable JwtAuthentication on DRF API endpoints. 2018-10-23 17:01:46 -04:00
Matthew Piatetsky
073df570fa Merge pull request #19095 from edx/expired_dashboard_message 
Add course duration limit and dashboard expiration code
 2018-10-23 12:17:58 -04:00
Jeremy Bowman
fc996c12a8 Merge pull request #19107 from EDUlib/cert-translate 
Message related to certificate on courseware progress page are translated to platform language only
 2018-10-23 10:50:47 -04:00
Ahsan Ul Haq
b9dfe19781 Merge pull request #19124 from edx/ahsan/LEARNER-6039-Batch-completion-requirement-update 
updated completion requiirement
 2018-10-23 15:47:40 +05:00
Ahsan Ulhaq
0d2a5882cb updated completion requiirement 
LEARNER-6039
 2018-10-23 15:07:04 +05:00
attiyaishaque
fca88da078 Fix that discussions are loading in the profile view. 2018-10-23 12:40:58 +05:00
Jeremy Bowman
3f6c7dd41d Merge pull request #19141 from edx/jmbowman/TE-2790 
TE-2790 Fix microsite config leak in tests
 2018-10-22 20:56:53 -04:00
Matthew Piatetsky
9037999bd2 add content gating waffle flag 2018-10-22 20:49:08 -04:00
David Ormsbee
57a09b7b4c Merge pull request #17449 from open-craft/ciuin/instructor-enrollment-status-check 
Add enrollment status check for instructor
 2018-10-22 16:57:40 -04:00
George Babey
f39cd81a31 Merge pull request #18545 from open-craft/kshitij/stylelint-fixes 
Bulk stylelint fixes
 2018-10-22 14:59:11 -04:00
Jeremy Bowman
f1668c3e55 TE-2790 Fix microsite config leak in tests 2018-10-22 14:48:28 -04:00
Jeremy Bowman
038d7f2b70 Merge pull request #19134 from edx/jmbowman/TE-2786 
TE-2786 Fix grade computation test assertions
 2018-10-22 13:16:17 -04:00
John Hensley
efc3057fe1 Add enrollment status check for instructor 
To the Student Admin tab of the instructor dashboard, add the ability to
check a specific learner's enrollment status.
 2018-10-23 03:31:43 +10:30
sambapete
1955a273f7 Fix translation issue related to message showed on courseware progress 
page related to certification and course mode.
 2018-10-22 10:56:32 -04:00
Saleem Latif
7517eb918b Merge pull request #19088 from edx/saleem-latif/ENT-1088 
ENT-1088: Third Party Authentication (SSO): Default values for SAML attributes
 2018-10-22 12:41:33 +05:00
Saleem Latif
ec2a36b4a4 Third Party Authentication (SSO): Default values for SAML attributes 2018-10-22 11:03:01 +05:00
edX Transifex Bot
20bd8621df Update translations 2018-10-21 17:18:22 -04:00
Jeremy Bowman
d961f9658e TE-2786 Fix grade computation test assertions 2018-10-19 17:17:38 -04:00
Michael Youngstrom
49e287b703 Merge pull request #19131 from edx/youngstrom/mongo-tweaks 
Use uuid instead of randint for db names in Mongo builders
 2018-10-19 15:57:00 -04:00
Michael Youngstrom
cc1d389f21 Replace randint in db name with pid 2018-10-19 14:24:27 -04:00
Simon Chen
fc24371b18 Merge pull request #19091 from edx/rir/masters-gradebook 
Add extesion engine gradebook ui in under the mastersGradebook route
 2018-10-19 13:37:32 -04:00
Emma Green
ce7b094cfb don't error out to user programs with really old course runs not in lms 2018-10-19 13:25:28 -04:00
Dillon-Dumesnil
0fe187dfac Merge pull request #19132 from edx/ddumesnil/normalize-fix 
Ensuring password to be normalized is unicode. Fixing issue with third party authenticated passwords being unicode. We used to create them as strings.
 2018-10-19 13:21:08 -04:00
Rick Reilly
0c8d66bb2a Add extesion engine gradebook ui in under the mastersGradebook route 2018-10-19 12:56:16 -04:00
Dillon Dumesnil
a5f3f1cbee Ensuring password to be normalized is unicode 2018-10-19 12:41:51 -04:00
Dillon-Dumesnil
3619ec0d3e Merge pull request #19130 from edx/ddumesnil/pw_rollout_messaging 
Improving the password complexity rollout messaging per UX's recommen…
 2018-10-19 11:23:55 -04:00
Dillon Dumesnil
5910601cdd Improving the password complexity rollout messaging per UX's recommendations 2018-10-19 10:34:00 -04:00
Cory Lee
78c7359563 Merge pull request #19127 from edx/coryleeio/reduce_logging_volume 
Removing unnecessary log statements
 2018-10-19 09:49:20 -04:00
Nadeem Shahzad
f43aa07aaa Merge pull request #19119 from edx/nadeem/add_xforwardedfor_middleware_and_make_upgrade 
Add xforwardedfor middleware and make upgrade(OPS-3544)
 2018-10-19 00:21:07 +05:00
Brian Mesick
95ac59bd97 Merge pull request #18237 from open-craft/cliff/sso-discovery-upstream 
Add endpoint to get SAML providers for a user.
 2018-10-18 14:38:11 -04:00
Michael Youngstrom
2c368fda5a Merge pull request #19129 from edx/youngstrom/add-unique-value-to-contentstore 
Use separate contentstore db's for cms tests
 2018-10-18 14:33:50 -04:00
Troy Sankey
d3c7de7713 Merge pull request #19128 from edx/pwnage101/update-notes-retirement-endpoint-PLAT-2367 
update the name of the GDPR/retirement notes endpoint
 2018-10-18 14:33:09 -04:00
nadeemshahzad
d42e29a2f6 pin Mrkdown version 2018-10-18 18:31:29 +00:00
J. Cliff Dyer
b3521e0f88 Add endpoint to get SAML providers for a user. 
View is combined with user SSO views.

Includes a new version of the view that takes explicit "username" or "email".

OC-4285
 2018-10-18 14:02:12 -04:00
Troy Sankey
35d052492d update the name of the GDPR/retirement notes endpoint 
In https://github.com/edx/edx-notes-api/pull/67 the name of the endpoint
url changed in order to mitigate LEARNER-6532.  This commit gets
edx-platform back in sync.

PLAT-2367
 2018-10-18 13:53:17 -04:00
Michael Youngstrom
dea812ecd0 Add unique value to cms db name 2018-10-18 11:31:31 -04:00
Cory Lee
305167cd86 Removing unnecessary log statements 2018-10-18 11:08:54 -04:00
Nimisha Asthagiri
75a739e252 Merge pull request #19123 from edx/arch/email-profile-scopes 
Add email and profile scopes in JWT Cookies
 2018-10-18 09:35:41 -04:00
Brian Mesick
4ca6169131 Merge pull request #19083 from edx/bmedx/add_retirement_delete_api 
Adds an API to bulk delete completed retirements
 2018-10-18 08:54:34 -04:00
Nimisha Asthagiri
45dadca18b Add email and profile scopes in JWT Cookies 2018-10-18 08:11:04 -04:00
Matthew Piatetsky
3c47d19a52 add redirect behavior when accessing expired course and add tests 2018-10-17 21:37:28 -04:00