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

47893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
d5751efac3 Merge pull request #19260 from open-craft/xblock-view-oauth 
Allow calling xblock_view API with OAuth creds
 2018-11-28 13:01:54 -05:00
Braden MacDonald
1e4dc51ac7 Allow calling xblock_view API with OAuth creds 2018-11-28 09:25:30 -08:00
Nimisha Asthagiri
b4f0796ce6 Merge pull request #19327 from edx/arch/adr-jwt-cookie-opt-in 
Update jwt-in-session-cookie decision with HTTP_USE_JWT_COOKIE header
 2018-11-28 11:56:40 -05:00
Alex Dusenbery
66ed41dcd2 Link to the writable gradebook if feature is enabled. 2018-11-28 10:47:20 -05:00
Calen Pennington
a7ab4be972 Merge pull request #19314 from cpennington/test-super-user-access 
Add GlobalStaff to role tests for course duration limits and content …
 2018-11-28 10:08:07 -05:00
Nimisha Asthagiri
bcbcbc4f80 Merge pull request #19325 from edx/arch/email-verified-field 
Add email_verified field in JWT token
 2018-11-28 07:35:33 -05:00
noraiz-anwar
e0d19d6871 escape json for use in js 2018-11-28 17:31:27 +05:00
Nimisha Asthagiri
9a0812fcde Add email_verified field in JWT token 2018-11-28 06:36:48 -05:00
Rabia Iftikhar
8df5b58853 Merge pull request #19148 from edx/ri/EDUCATOR-2303-special-exams-gating-content 
EDUCATOR-2303 allow learners to see gated banner before starting proctored or timed exam
 2018-11-28 15:25:21 +05:00
Nadeem Shahzad
72fec724a5 Merge pull request #19241 from edx/nadeem/gunicorn_upgrade 
Upgrade Gunicorn to 19.0 (OPS-3445)
 2018-11-28 14:59:17 +05:00
rabiaiftikhar
6fbd86108c EDUCATOR-2303 allow learners to see gated banner before starting proctored or timed exam 2018-11-28 14:11:17 +05:00
nadeemshahzad
9d95c2e632 upgrade gunicorn 19.0 2018-11-28 08:08:21 +00:00
Nimisha Asthagiri
f19809c526 Update jwt-in-session-cookie decision to include HTTP_USE_JWT_COOKIE header 2018-11-27 23:59:34 -05:00
Calen Pennington
f17f88741a Add GlobalStaff to role tests for course duration limits and content gating 2018-11-27 15:26:00 -05:00
Simon Chen
c992edc83d Merge pull request #19322 from edx/schen/null_assignment_types 
Bugfix: Handle the case where assignment type is not in default_labeler
 2018-11-27 14:36:40 -05:00
Simon Chen
8941f8afbf Handle the case where assignment type is not in default_labeler 2018-11-27 12:53:28 -05:00
Alex Dusenbery
44101d656d Pick a better ordering field for CourseEnrollmentPagination in grades API. 2018-11-27 12:39:12 -05:00
DawoudSheraz
7fb51dfa16 Merge pull request #19308 from edx/dsheraz/educator_1714 
EDUCATOR-1714 due dates are not shown for Timed exams subsections on self-paced course on studio
 2018-11-27 15:07:39 +05:00
Zainab Amir
ceeabc6d62 Merge pull request #19307 from edx/change_credit_eligibility_deadline 
LEARNER-6643 change credit course eligibility deadline
 2018-11-27 14:55:24 +05:00
DawoudSheraz
e69fafce95 EDUCATOR-1714 due dates are not shown for Timed exams subsections on self-paced course on studio 2018-11-27 14:30:40 +05:00
Zainab Amir
b62ab09d85 LEARNER-6643 
Added management command to update credit eligibility deadline
Added tests for command change_eligibility_deadline
 2018-11-27 14:12:16 +05:00
emma-green
5167cf6cb4 Merge pull request #19288 from edx/emma-green/reve-74/make-sure-content-experiments-work-b 
add content experiments test to content gating
 2018-11-26 17:12:29 -05:00
Emma Green
2d5044512f add content experiments test to content gating 2018-11-26 16:29:11 -05:00
Bill Filler
af8f1029cd Merge pull request #19293 from edx/bfiller/REVE-96 
Don't allow audit-only courses to expire
 2018-11-26 15:49:02 -05:00
Matt Tuchfarber
d34c65a559 Merge pull request #19311 from edx/tuchfarber/content_gating_i18n 
Add translation for content gating access denied message
 2018-11-26 14:46:50 -05:00
Bill Filler
7b684106ba Don't allow audit-only courses to expire 2018-11-26 14:28:50 -05:00
Michael Youngstrom
463e19a263 Merge pull request #19298 from edx/youngstrom/lettuce-pipeline-jbo 
Add lettuce jenkinsfile
 2018-11-26 13:41:28 -05:00
Matt Tuchfarber
8b5b92b01a Add translation for content gating access denied message 2018-11-26 13:27:12 -05:00
Michael Youngstrom
dfe06cca01 Add lettuce jenkinsfile 2018-11-26 12:22:38 -05:00
Alex Dusenbery
009074ec4b Add an /api/courses/v1/grading endpoint to get assignment type and subsection info about a course. 2018-11-26 10:12:12 -05:00
Diana Huang
30eb003b2e Merge pull request #19243 from edx/diana/default-login-registration 
Force new page if not set in site configs.
 2018-11-26 10:06:19 -05:00
Bessie Steinberg
1bbd9dd131 Merge pull request #19301 from edx/bessiesteinberg/REVE-23-beta-testers 
REVE-101: Fix Beta Tester Experience and Test
 2018-11-26 10:01:22 -05:00
brianhw
2445a38818 Merge pull request #19302 from edx/brian/fix-segment-host 
Fix synthesized URL emitted to Segment.
 2018-11-26 09:58:27 -05:00
Gabe Mulley
1441cba962 Merge pull request #19272 from edx/reve-37/prevent-studio-edits 
REVE-37: prevent studio edits to feature based enrollments
 2018-11-26 09:57:23 -05:00
Stu Young
32e5f2855f Merge pull request #19300 from edx/testeng/bokchoy_auto_cache_update_8f2fbeb4aa089dd756f7a7628d5cdecde61ec354 
Bokchoy db cache update
 2018-11-26 09:04:08 -05:00
Gabe Mulley
f42094aefe fix a python unit test that fails at night 2018-11-25 21:42:02 -05:00
Gabe Mulley
5177e994c8 REVE-37: Prevent modifications to feature based enrollment user partitions 2018-11-25 21:42:02 -05:00
edX Transifex Bot
57bb1f4587 Update translations 2018-11-25 16:18:06 -05:00
Ayub
0e8bdf6bdc Merge pull request #19306 from edx/check-translataions-changed 
LEARNER-6773 make target to check if translations up-to-date
 2018-11-23 12:50:14 +05:00
ayub-khan
d63fea78f3 make target to check if translations up-to-date 2018-11-23 09:54:50 +05:00
Awais Jibran
bcf45f13be Merge pull request #19076 from edx/aj/fix-oom-error-cs50 
Workaround of CS50 OOM error
 2018-11-22 14:47:45 +05:00
Brian Wilson
48a3db7ffa Fix synthesized URL emitted to Segment. 
Add schema to URL synthesized from host and path.
 2018-11-22 02:40:02 -05:00
DawoudSheraz
cf2f91de1a Merge pull request #19290 from edx/dsheraz/educator_2234 
Educator 2234 - Avoid multiple mathjax loading on the discussion user profile page
 2018-11-22 11:37:59 +05:00
DawoudSheraz
e09fbab133 Avoid multiple mathjax loading on the discussion user profile page 2018-11-22 10:18:43 +05:00
Awais Jibran
4e98578f11 Workaround of CS50 OOM error 
EDUCATOR-3483
 2018-11-22 09:07:19 +05:00
Bessie Steinberg
4baedd37eb REVE-101: Fix Beta Tester Experience and Test 
Fix content type gating and duration gating expierence for Beta Testers

- Beta Testers are users who are granted early access to the course to
  test it out, they should not be gated on type or duration
- This change makes sure beta testers will have access to graded content
  and their access will not expire
- Added unit tests for the above change
 2018-11-21 16:22:36 -05:00
edx-cache-uploader-bot
3d0b28e996 Updating migrations 2018-11-21 14:34:39 -05:00
Calen Pennington
b05eac0b67 Merge pull request #19235 from edx/content-gating-config-flag 
Content gating config flag
 2018-11-21 12:52:17 -05:00
Calen Pennington
f84c121f43 Clean up several xss linter issues 2018-11-21 12:18:10 -05:00
Calen Pennington
b295472363 Use generator expressions to make Mobile API constraints clearer 2018-11-21 12:18:10 -05:00