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

44314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tasawer Nawaz
d00697f592 Merge pull request #16949 from edx/tasawer/learner-3594/update-zendesk-proxy-and-frontend-jsx 
zendesk proxy and front end of support form updated
 2017-12-20 23:25:42 +05:00
Tasawer Nawaz
82051d0312 zendesk proxy and front end of support form updated + filuploading is disbaled 
LEARNER-3594
 2017-12-20 22:16:31 +05:00
Michael Terry
dbc7b89452 Merge pull request #16978 from edx/mikix/editable-course-run 
Avoid a dropdown for course runs
 2017-12-20 11:33:43 -05:00
Ayub khan
5406e14e17 Merge pull request #16975 from edx/update-translations-18-DEC 
updated translations
 2017-12-20 21:23:31 +05:00
Anthony Mangano
0cb6bad7ca Merge pull request #16971 from edx/fix-for-LEARNER-3482 
Ensure enrollment_end is parsed to datetime prior to making comparisons
 2017-12-20 10:52:57 -05:00
Gabe Mulley
0efc376488 Merge pull request #16976 from edx/mulby/fix-ace-ga-tracking 
fix GA tracking of ACE emails
 2017-12-20 10:32:42 -05:00
Michael Terry
1650813d17 Avoid a dropdown for course runs 
Entitlement detail pages in django admin normally show a dropdown
button for the enrollment_course_run field. But on stage, that can
cause a timeout because the enrollment database is so large.
So instead, just show it as a raw id field.
 2017-12-20 10:26:46 -05:00
McKenzie Welter
8279b77c2a Merge pull request #16940 from edx/McKenzieW/learner-3612 
Add email settings to the gear icon drop down for fulfilled entitlements and fix a11y issues
 2017-12-20 10:22:24 -05:00
Gabe Mulley
b118f0633c fix GA tracking of ACE emails 2017-12-20 08:59:06 -05:00
McKenzie Welter
a4d23eaea9 include email settings in fulfilled entitlement action items 2017-12-20 08:57:27 -05:00
ayub-khan
fcac9ad1e9 updated translations 2017-12-20 17:03:51 +05:00
Hasnain Naveed
9f921bf618 Merge pull request #16227 from edx/hasnain-naveed/WL-1282 
(WIP) WL-1282 | Created management command for automation of theme setup.
 2017-12-20 14:58:08 +05:00
Anthony Mangano
47287de409 ensure enrollment_end is parsed to datetime prior to making comparisons 2017-12-19 16:22:25 -05:00
Michael LoTurco
98fd05b4ee Merge pull request #16959 from edx/MLoTurco/learner-3579 
MLoTurco/learner 3579 Upgrade audit enrollments on entitlement purchase
 2017-12-19 16:21:21 -05:00
Robert Raposa
a0bf63a1da Merge pull request #16967 from edx/robrap/remove-flaky-timing-assertions 
PLAT-1864: Fix test_course_listing_performance flaky test.
 2017-12-19 16:12:16 -05:00
Cliff Dyer
82ad9295da Merge pull request #16569 from open-craft/cliff/video-completion 
Define custom completion for VideoModule
 2017-12-19 15:27:40 -05:00
Michael LoTurco
f0ab07a154 Upgrade audit enrollments on entitlement purchase 
Adds check for existing upgradeable enrollment on user entitlement
creation, if single upgradeable enrollment is present, upgrades enrollment
to entitlement mode and links the entitlement to the upgraded enrollment

LEARNER-3579
 2017-12-19 14:54:10 -05:00
Sylvia Pearce
2c4a52075e Merge pull request #16914 from edx/sylvia/proctoringRC 
Update requirements file to use version 1.3.2 of edx proctoring
 2017-12-19 14:43:15 -05:00
Robert Raposa
d2b0d0cd0e Fix test_course_listing_performance flaky test. 
Fix test by removing timers and leaving other assertions.
 2017-12-19 14:40:09 -05:00
J. Cliff Dyer
1fc43bf60d Define custom completion for VideoModule 
Update the VideoModule to publish a completion event when the player
reaches 95% complete, and submit a BlockCompletion when that event
occurs.

OC-3091
MCKIN-5897
 2017-12-19 14:12:28 -05:00
Douglas Hall
5a8579d387 Merge pull request #16956 from edx/douglashall/update_enterprise_0_56_4 
Updating edx-enterprise package to 0.56.4.
 2017-12-19 13:52:22 -05:00
Simon Chen
131b14b111 Merge pull request #16961 from edx/schen/EDUCATOR-1549 
Programmatically indicate nested discussions in filter
 2017-12-19 13:40:05 -05:00
Jeff LaJoie
e063a8bdd8 Merge pull request #16952 from edx/jlajoie/LEARNER-3482 
LEARNER-3482: Do not show sessions past their enrollment end
 2017-12-19 12:53:12 -05:00
Douglas Hall
7f9cecc673 Updating edx-enterprise package to 0.56.4. 
https://github.com/edx/edx-enterprise/compare/0.56.3...0.56.4
 2017-12-19 12:43:01 -05:00
Harry Rein
3f9ab6ef7b Merge pull request #16955 from edx/HarryRein/LEARNER-3646-change-or-leave-session 
Update entitlement card to use Change or Leave Session.
 2017-12-19 11:43:26 -05:00
Simon Chen
3de6e7789b Programmatically indicate nested discussions in filter 
This is an a11y fix on the discussion topic display on the left. We are going to write out all the parent catagories for each topic
EDUCATOR-1549
 2017-12-19 11:16:07 -05:00
Jeff LaJoie
23dbc611fe Filters for only course runs that have an enrollment end date in the future or don't have one 2017-12-19 10:59:10 -05:00
Harry Rein
908c769ae3 Update entitlement card to use Change or Leave Session. 
LEARNER-3646
 2017-12-19 10:26:17 -05:00
Bessie Steinberg
a4fa04ec3e Merge pull request #16931 from edx/bessiesteinberg/WL-1288-registration-page-customization 
Add Job Title field to Registration Page
 2017-12-19 09:49:53 -05:00
Anthony Mangano
c8d0d5eb33 Merge pull request #16938 from edx/LEARNER-3633-fix-entitlement-unenrollment-modal-a11y-issues 
LEARNER-3633 fix entitlement unenrollment modal a11y issues
 2017-12-19 09:49:12 -05:00
Michael Roytman
ff1ff6e192 Merge pull request #16697 from edx/mroytman/add-to-contentstore-response 
add sort direction and asset types as part of the assets JSON response
 2017-12-19 09:38:25 -05:00
Jeremy Bowman
93c3f5f9d7 Merge pull request #16948 from edx/revert-16915-jmbowman/PLAT-1858 
Revert "PLAT-1858 Better capture of deprecation warnings"
 2017-12-18 22:30:25 -05:00
Jeremy Bowman
1dbdee9c54 Revert "PLAT-1858 Better capture of deprecation warnings" 2017-12-18 21:18:02 -05:00
Michael Roytman
d98e7d4f24 add sort direction and asset types as part of the assets JSON response 2017-12-18 19:23:49 -05:00
Anthony Mangano
fdadd4cdf4 Fix a11y issues with unenroll modal 2017-12-18 16:44:09 -05:00
Harry Rein
5e2c3e4bf5 Merge pull request #16933 from edx/HarryRein/LEARNER-3636-dont-show-expired-entitlements-unenrolled 
Do not show expired, unfulfilled entitlements on dashboards.
 2017-12-18 16:26:43 -05:00
Jeremy Bowman
0e52b4581f Merge pull request #16915 from edx/jmbowman/PLAT-1858 
PLAT-1858 Better capture of deprecation warnings
 2017-12-18 16:23:58 -05:00
Bessie Steinberg
b340174e12 Add Job Title field to Registration Page 
Add 'Job Title' as configurable field on the registration page.
Job Title will be saved to the 'meta' field of the 'userprofile' table.
 2017-12-18 16:20:11 -05:00
Michael Terry
e32ff53f5f Merge pull request #16935 from edx/mikix/expired-rel-programs 
Show programs for expired entitlements
 2017-12-18 15:51:06 -05:00
Harry Rein
75aa736dcf Do not show expired, unfulfilled entitlements on course/programs dashboard. 
LEARNER-3636
 2017-12-18 15:16:35 -05:00
Matthew Piatetsky
6ea32b7ae6 Merge pull request #16923 from edx/LEARNER-3557 
LEARNER-3557 Add is_enterprise cookie on login page to be checked on basket page
 2017-12-18 15:00:44 -05:00
Jeremy Bowman
b26fe5fd24 PLAT-1858 Better capture of deprecation warnings 2017-12-18 14:59:05 -05:00
Michael Terry
4fe60eb1e4 Show programs for expired entitlements 
The dashboard was not showing related programs for expired but
fulfilled entitlements.

LEARNER-3608
 2017-12-18 14:41:20 -05:00
Matthew Piatetsky
4a2262967f Add is_enterprise cookie on login page to be checked on basket page 2017-12-18 13:51:37 -05:00
Matt Tuchfarber
70566b5d9d Fix double headers or WL registration page 2017-12-18 13:33:49 -05:00
Cliff Dyer
ca46bfcf06 Merge pull request #16688 from open-craft/cornwell/rest-endpoint 
MCKIN-5896 - Create a REST endpoint for batch-uploading offline completions.
 2017-12-18 11:37:24 -05:00
Matthew Piatetsky
dd8e879e79 Merge pull request #16892 from edx/LEARNER-3072 
LEARNER-3072 Add bundle purchase button to course dashboard
 2017-12-18 10:54:55 -05:00
Michael Terry
e705ff09a5 Merge pull request #16924 from edx/mikix/LEARNER-3588 
Show related programs on entitlements
 2017-12-18 09:05:14 -05:00
Michael Frey
d48a1d5f46 Merge pull request #16926 from edx/mjfrey/LEARNER-3606 
Get only the first program from the list of matching entitlements.
 2017-12-18 07:41:52 -05:00
Saleem Latif
79d95e9caf Merge pull request #16691 from edx/saleem-latif/ENT-760 
[ENT-760]:  Disable linking of personal accounts to enterprise customers via SSO
 2017-12-18 16:31:51 +05:00