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

47932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gabe Mulley
5efccffe4a Merge pull request #19368 from edx/test-asset-fix 
Switch static assets to courseware friendly version
 2018-12-04 14:14:07 -05:00
Calen Pennington
54a2cae482 Switch static assets to courseware friendly version 2018-12-04 13:23:15 -05:00
brianhw
acc919ca46 Merge pull request #19353 from edx/brian/DE-1121-email-context 
Add page context to edx.bi.email.sent events
 2018-12-04 12:10:27 -05:00
Matthew Piatetsky
c3f0509d8b Merge pull request #19358 from edx/REVE-1 
Fix content gating a11y issues
 2018-12-04 09:20:29 -05:00
DawoudSheraz
598d110ffe Merge pull request #19326 from edx/dsheraz/educator_3140 
EDUCATOR-3140 prevent saving pre-1900 subsection due dates
 2018-12-04 12:56:15 +05:00
Brian Wilson
f21bf05e37 Add page context to edx.bi.email.sent events. 2018-12-04 02:47:37 -05:00
DawoudSheraz
e27a3992f8 Merge pull request #19345 from edx/dsheraz/educator3604 
Discussion forum title input programmatic association
 2018-12-04 12:11:12 +05:00
DawoudSheraz
05663098fd EDUCATOR-3140 prevent saving pre-1900 subsection due dates 2018-12-04 10:19:06 +05:00
DawoudSheraz
47a7fcda4e EDUCATOR-3604 programmatic association for Discussion Forum title label 2018-12-04 10:10:55 +05:00
Matthew Piatetsky
67e9ae5581 Fix content gating a11y issues 2018-12-03 23:26:47 -05:00
Simon Chen
73abc25bef Merge pull request #19357 from edx/schen/EDUCATOR-3754 
Gradebook view add page_size parameter
 2018-12-03 14:45:40 -05:00
Simon Chen
e0fb4729a0 Gradebook view add page_size parameter 2018-12-03 14:02:10 -05:00
Gabe Mulley
fe819804d5 Merge pull request #19321 from edx/reve-103/masquerade-fixes 
REVE-103: Fix masquerade for feature based enrollments
 2018-12-03 12:56:23 -05:00
Gabe Mulley
3c5caaf762 REVE-103: Fix masquerade for feature based enrollments 2018-12-03 12:05:00 -05:00
Calen Pennington
e95be9c419 Merge pull request #19354 from edx/feanil/fix_tests 
Correct to use datetime instead of date.
 2018-12-03 11:22:10 -05:00
Feanil Patel
eb8b5575ae Correct to use datetime instead of date. 2018-12-03 10:38:48 -05:00
Jeff Witt
f38af4d32f Merge pull request #19344 from edx/noraiz/EDUCATOR-3603 
programmatically associate label tag
 2018-12-03 08:25:35 -05:00
Calen Pennington
bced52b728 Merge pull request #19334 from cpennington/enabled-as-of-datetime 
Enabled as of datetime
 2018-11-30 15:09:11 -05:00
Calen Pennington
31047260cc Switch ContentTypeGatingConfig.enabled_as_of and CourseDurationLimitConfig.enabled_as_of to datetimes 2018-11-30 10:02:53 -05:00
noraiz-anwar
72390b62da review suggestions 2018-11-30 18:58:56 +05:00
noraiz-anwar
87ed4e39cd programmatically associate label tag 2018-11-30 17:03:48 +05:00
Simon Chen
e284bc3099 Merge pull request #19231 from edx/aed/performance 
Prefetch/cache subsection grades for gradebook.
 2018-11-29 14:30:12 -05:00
Alex Dusenbery
305573ed8e Prefetch/cache subsection grades for gradebook. 2018-11-29 13:06:28 -05:00
Alex Dusenbery
0d51f90568 Move gradebook course info API into LMS 2018-11-29 13:05:42 -05:00
Matthew Piatetsky
bbfbd43cb7 Merge pull request #19335 from edx/REVE-108 
Ensure staff users do not see expiration banner
 2018-11-29 12:42:25 -05:00
Calen Pennington
af86f7856c Merge pull request #19333 from cpennington/enable-content-gate-partition-when-override-enabled 
Enable content gate partition when override enabled
 2018-11-29 10:59:47 -05:00
Simon Chen
352ba32cc6 Merge pull request #19287 from edx/schen/EDUCATOR-3653 
Create the persistentsubsectiongradeoverride audit records
 2018-11-29 10:40:41 -05:00
Calen Pennington
f8833e1ffc Enable the ContentTypeGatePartition when the ContentTypeGatingConfig.studio_override_enabled is True 2018-11-29 10:24:41 -05:00
Matthew Piatetsky
08301a484e Ensure staff users do not see expiration banner 2018-11-29 09:45:49 -05:00
Simon Chen
f016175c82 Add the new history model for persistentsubsectiongradeoverride to record audit info 2018-11-29 09:38:21 -05:00
Michael Youngstrom
b5efdf40fb Merge pull request #19336 from edx/youngstrom/fix-flaky-a11y-db 
Revert any test db cache changes after test_a11y
 2018-11-29 09:35:32 -05:00
Muhammad Ammar
b1ea91e0a0 Merge pull request #19338 from edx/ammar/ENT-1317 
update edx-enterprise version to 1.0.6
 2018-11-29 17:56:31 +05:00
muhammad-ammar
8d4b8b30fe update edx-enterprise version to 1.0.6 2018-11-29 16:34:52 +05:00
=
2b8a6e724a Revert any db changes after test_a11y 2018-11-29 00:16:13 -05:00
Brian Mesick
4278fc7de2 Merge pull request #19320 from edx/bmedx/remove_3rd_part_mailings_retirement 
DEPR-8 - Remove retire_mailings endpoint and supporting code
 2018-11-28 14:16:54 -05:00
Matthew Piatetsky
6b2b5d1cdd Merge pull request #19280 from edx/REVE-24 
[REVE-24] Populate experiment data with holdback key post enrollment
 2018-11-28 14:12:53 -05:00
Matthew Piatetsky
815acda002 Populate experiment data with holdback key post enrollment and check holdback key when setting user group 2018-11-28 13:40:57 -05:00
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
Calen Pennington
2a42628e19 Put actual data in ContentTypeGatingConfig and CourseDurationLimitConfig __str__ methods 2018-11-28 12:19:33 -05: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