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

47964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
325fbe4eb2 Hide empty container blocks from the course blocks api when called by the mobile app 
All code in this PR should be removed after REVE-52 is merged and mobile
traffic from older app versions falls to < 5% of the mobile traffic
to the course_blocks api
 2018-12-20 15:17:24 -05:00
Farhanah Sheets
2d338b34aa Merge pull request #18992 from open-craft/josh/progress_data_block 
Put certificate data message into it's own block for overriding
 2018-12-07 10:58:28 -05:00
Farhanah Sheets
7e1cc16b10 Merge pull request #18477 from eduNEXT/dqe/Missing-translation-EDUCATOR-1338 
Missing translation EDUCATOR-1338
 2018-12-07 10:57:36 -05:00
Squirrel18
002227f970 Add gettext string to underscore template. 2018-12-07 09:33:34 -05:00
Cali
5a1f514db9 Merge pull request #19359 from edx/cstenson/has_purchased_metadata 
Add user_metadata to reflect if a user has purchased before.
 2018-12-07 09:30:36 -05:00
Cali Stenson
241cff006a Add user_metadata to reflect if a user has purchased before. 
REVO-20
 2018-12-07 07:48:32 -05:00
DawoudSheraz
6840da3f5d Merge pull request #19373 from edx/dsheraz/educator3605 
EDUCATOR-3605 Adding Visible Labels for search and filter inputs
 2018-12-07 11:45:41 +05:00
DawoudSheraz
bf99e15707 EDUCATOR-3605 Adding Visible Labels for search and filter inputs on discussion page 2018-12-07 10:26:04 +05:00
Bill Filler
f945ac6bce Merge pull request #19382 from edx/bfiller/REVE-143 
REVE:143: mobile api check config model before returning expiration date
 2018-12-06 16:51:55 -05:00
Bill Filler
7f18ab0374 Check config model before returning expiration date 2018-12-06 15:22:11 -05:00
Saleem Latif
6ef5305280 Merge pull request #19377 from edx/revert-19318-saleem-latif/ENT-1116 
Revert "ENT-1116:  Add recovery email to account settings page"
 2018-12-06 22:35:10 +05:00
Saleem Latif
a28eb818be Fixed quality and a typo 2018-12-06 21:51:04 +05:00
Alex Dusenbery
62f1a90e1d Update the Gradebook API decision record. 2018-12-06 11:34:27 -05:00
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