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

47667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nadeem Shahzad
eea6a0488c Merge pull request #19173 from edx/nadeem/OPS-3445 
Upgrade gunicorn to 19.0 and make upgrade (OPS-3445)
 2018-10-30 18:56:24 +05:00
nadeemshahzad
f6c215ae5b upgrade gunicorn 19.0 and make upgrade 2018-10-30 10:42:58 +00:00
Simon Chen
a657348436 Merge pull request #19177 from edx/schen/EDUCATOR-3619 
Hook up the Datatable Gradebook with grade bulkupdate API
 2018-10-29 15:43:23 -04:00
Simon Chen
4edbbbb66f Update the gradebook functionality to allow grades update. 
The override modal is now able to update grades for all users for each gradable unit in the course
 2018-10-29 15:00:35 -04:00
Jeremy Bowman
e3d858c2a5 Merge pull request #19167 from edx/jmbowman/fix_xsscommitlint_junitxml 
Fix xsscommitlint JUnit XML
 2018-10-29 14:14:58 -04:00
Alex Dusenbery
b528b8e5d7 EDUCATOR-3622 | Add a username_contains query param to gradebook endpoint 2018-10-29 14:08:23 -04:00
Calen Pennington
c02b195ff7 Merge pull request #19155 from edx/rev/allow-studio-content-gating-override 
Add Studio UI for tagging Full/Limited access contont
 2018-10-29 13:19:45 -04:00
Calen Pennington
f9dd7fe223 Allow Studio override of Feature Based Enrollment status for individual xblocks 2018-10-29 12:37:30 -04:00
Calen Pennington
99f8918b74 Add an automatic UserPartition and Scheme for Content Type Gating. 
For now, this UserPartition groups all users as Full-access users.
 2018-10-29 12:37:30 -04:00
Brian Mesick
6092dfbb94 Merge pull request #19168 from edx/bmedx/fixup_populate_retirement_states 
Add dry run option to populate_retirement_states command
 2018-10-29 11:48:47 -04:00
Calen Pennington
0adb654724 Add a shell app for content_type_gating 2018-10-29 11:44:44 -04:00
Brian Mesick
01309bd1a8 Merge pull request #19164 from edx/bmedx/bulk_cleanup_to_post 
Change bulk delete retirements to a POST
 2018-10-29 09:52:34 -04:00
edX Transifex Bot
e876a35c9e Update translations 2018-10-28 17:18:33 -04:00
Douglas Hall
d72511da4a Merge pull request #19169 from edx/douglashall/disable_jwt_auth_cookie 
Disable JWT auth cookie.
 2018-10-27 06:06:40 -04:00
Douglas Hall
f8008dacf5 Disable JWT auth cookie. 2018-10-26 21:23:19 -04:00
bmedx
e5613a59ce Add dry run option to populate_retirement_states command 2018-10-26 16:07:59 -04:00
bmedx
bff1cf3b74 Change bulk delete retirements to a POST 2018-10-26 14:49:15 -04:00
Jeremy Bowman
f62d02540b Fix xsscommitlint JUnit XML 2018-10-26 11:38:09 -04:00
Simon Chen
eb083a8475 Merge pull request #19163 from edx/schen/EDUCATOR-3582-comments 
Take away the comments column on grade override modal dialog
 2018-10-26 10:40:52 -04:00
Simon Chen
a9f4151d26 Merge pull request #19162 from edx/schen/EDUCATOR-3582-current_grade 
Remove the current_grades column that is not supported by backend
 2018-10-25 22:20:04 -04:00
Simon Chen
0f043a3c5a Merge pull request #19154 from edx/schen/EDUCATOR-3582 
Update the gradebook UI to match the initial standards of the edx-platform experience
 2018-10-25 22:19:43 -04:00
Douglas Hall
653d8592b8 Merge pull request #19160 from edx/douglashall/oauth2_logout_redirect 
Enable OAuth2 clients to logout with a redirect back to the client site.
 2018-10-25 15:53:06 -04:00
Simon Chen
bde9bd2041 Update the new writable gradebook UI to make it look better 2018-10-25 15:28:28 -04:00
Matthew Piatetsky
2665d6e4fb Merge pull request #19161 from edx/user_course_expiration_clarifications 
Add clarifying information regarding user course expiration
 2018-10-25 15:27:27 -04:00
Simon Chen
39fddf472e Take away the comments column on grade override 2018-10-25 15:16:54 -04:00
Douglas Hall
72300c620a Enable OAuth2 clients to logout with a redirect back to the client site. 2018-10-25 14:54:43 -04:00
Simon Chen
95ea9d065e Remove the current_grades column that is not supported by backend 2018-10-25 14:53:26 -04:00
Alex Dusenbery
c11a2c0a6e EDUCATOR-3471 | Add a grade override bulk update view. 2018-10-25 14:52:12 -04:00
Matthew Piatetsky
287acf5eef Add clarifying information regarding user course expiration 2018-10-25 14:48:16 -04:00
Stu Young
daa24fa5d7 Merge pull request #19159 from edx/testeng/bokchoy_auto_cache_update_5b5d9cb0eb5453505fd8c9da80ee0607b26b2f6c 
Bokchoy db cache update
 2018-10-25 14:27:35 -04:00
Matt Tuchfarber
c4cea14ead Merge pull request #19143 from edx/tuchfarber/REV-351 
Determine expiration dates for self paced courses REV-531
 2018-10-25 13:53:13 -04:00
edx-cache-uploader-bot
2bad03fe0d Updating migrations 2018-10-25 13:08:02 -04:00
Matt Tuchfarber
6a01093423 Flesh out expiration date for user-course combo logic 2018-10-25 12:55:53 -04:00
irfanuddinahmad
66b1c07b71 Merge pull request #19158 from edx/iahmad/ENT-1273-Version-bump-for-edx-enterprise-to-1.0.2 
Version bump for edx-enterprise to 1-0-2
 2018-10-25 20:23:32 +05:00
Nadeem Shahzad
0bef89413c Merge pull request #19087 from edx/nadeem/OPS-3544 
Add xforwardedformiddleware (OPS-3544)
 2018-10-25 19:41:29 +05:00
irfanuddinahmad
f6fd2ffa7a Version bump for edx-enterprise to 1-0-2 2018-10-25 19:37:39 +05:00
nadeemshahzad
1ff04aaf3d add xforwardedfor middlewar 2018-10-25 13:33:42 +00: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