Commit Graph

47950 Commits

Author SHA1 Message Date
Saleem Latif
18b66819e2 Revert "ENT-1116: Add recovery email to account settings page" 2018-12-06 21:20:46 +05:00
Alex Dusenbery
cb3b7e1822 Make gradebook GET API more performant. 2018-12-06 10:53:16 -05:00
Stu Young
d0ae725454 Merge pull request #19375 from edx/testeng/bokchoy_auto_cache_update_133ba73954bdfcee6d76985a04f8e94af5b1e533
Bokchoy db cache update
2018-12-06 10:30:39 -05:00
edx-cache-uploader-bot
8a7e22315c Updating migrations 2018-12-06 09:35:26 -05:00
Saleem Latif
737420d9d3 Merge pull request #19318 from edx/saleem-latif/ENT-1116
ENT-1116:  Add recovery email to account settings page
2018-12-06 15:08:51 +05:00
Saleem Latif
2055f94253 Add recovery email to account settings page 2018-12-06 14:27:28 +05:00
Matt Tuchfarber
c263360eda Merge pull request #19355 from edx/tuchfarber/add_content_gating_deduplication_tests
Add tests to verify access denied message deduplication works
2018-12-05 14:14:15 -05:00
Matt Tuchfarber
5a60fc1db6 Add tests to verify access denied message deduplication works 2018-12-05 13:40:22 -05:00
Nimisha Asthagiri
405690b7a9 Merge pull request #19372 from edx/arch/move-modulestore-docs
Colocate Modulestore docs with its code
2018-12-05 12:25:44 -05:00
Nimisha Asthagiri
b842d4b1f1 Colocate Modulestore docs with modulestore code 2018-12-05 11:08:33 -05:00
brianhw
7a699ffc56 Merge pull request #19371 from edx/brian/add-host-to-ga-pixel
Add hostname to GoogleAnalyticsTrackingPixel
2018-12-05 10:05:49 -05:00
noraiz-anwar
b4b87f1980 fix a11y on discussion page 2018-12-05 19:06:22 +05:00
noraiz-anwar
cf94a662d4 a11y fix on account page 2018-12-05 11:59:55 +05:00
Brian Wilson
76053f47ad Add hostname to GoogleAnalyticsTrackingPixel. 2018-12-04 17:26:52 -05:00
Feanil Patel
3a302c78cb Merge pull request #19201 from edx/feanil/make_upgrade
Make upgrade.
2018-12-04 16:11:38 -05:00
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
Feanil Patel
7a95fee331 Run make upgrade again. 2018-12-04 11:35:26 -05:00
Feanil Patel
a0066e276d Pin splinter due to failing tests. 2018-12-04 11:34:40 -05:00
Feanil Patel
ca00e7630f Run make upgrade 2018-12-04 10:24:21 -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