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

44295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
McKenzie Welter
b177f3daab include email settings in fulfilled entitlement action items 2017-12-20 12:34:09 -05:00
Michael LoTurco
128486d79a 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-20 12:33:50 -05:00
Anthony Mangano
2c984719e9 ensure enrollment_end is parsed to datetime prior to making comparisons 2017-12-20 12:33:38 -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
adeel khan
aefaab727f Merge pull request #16857 from edx/adeel/Learner_3491_removing_tags_for_certificate_rendering 
Fix certificate's course title for xss tag injection.
 2017-12-18 11:29:19 +00:00
Saleem Latif
86da9c1c63 Disable linking of personal accounts to enterprise customers via SSO 2017-12-18 15:12:42 +05:00
Adeel Khan
5773001f75 Fix certificate's course title for xss tags injection. 
This fix would enable course author to selectively add
basic html tags to course title, while removing any
other injected tags that could execute javascript.

LEARNER-3491
 2017-12-18 14:08:22 +05:00
Michael Frey
3305a7c3ff Get only the first program from the list of matching entitlements. 
LEARNER-3606
 2017-12-17 17:32:52 -05:00
edX Transifex Bot
257de20d95 Update translation strings 2017-12-17 16:52:42 -05:00
Anthony Mangano
d2b14f1542 Merge pull request #16855 from edx/amangano/LEARNER-2668-entitlement-refund-front-end-approach4 
Entitlement dashboard unenroll functionality
 2017-12-15 21:07:48 -05:00
Anthony Mangano
a6cb0fef1c add dashboard entitlement actions 2017-12-15 13:37:06 -05:00
Michael Terry
7e01d66bbd Show related programs on entitlements 
A list of Related Programs should appear for entitlements, like they
do for enrollments. We already fixed this in the base code, but we
(I) missed the edx.org theme version.

LEARNER-3588
 2017-12-15 13:36:02 -05:00
Nimisha Asthagiri
7fda9bd60c Merge pull request #16859 from open-craft/tomaszgy/completion_in_blocks_api_read_1 
Bump READ_VERSION of BlockCompletionTransformer to 1
 2017-12-15 13:32:03 -05:00
Rabia Iftikhar
6388391da6 Merge pull request #16912 from edx/ri/EDUCATOR-1930-set-score-raises-integrity-error 
EDUCATOR-1930 resolve Integrity Error exception in set score method for student module table's duplicate entry
 2017-12-15 23:07:25 +05:00
Albert (AJ) St. Aubin
365b4fb312 Merge pull request #16920 from edx/aj/add_is_expired_check_to_policy 
Aj/add is expired check to policy
 2017-12-15 12:42:45 -05:00
Matt Tuchfarber
b6030a4b13 Merge pull request #16685 from edx/tuchfarber/expand_program_faqs 
Make program marketing FAQ single column
 2017-12-15 12:22:56 -05:00
rabia23
dbd0468a6e EDUCATOR-1930 resolve Integrity Error exception in set score method for student module table's duplicate entry 2017-12-15 16:57:10 +00:00
Albert St. Aubin
3fbb1571df Update to policy check utilities for Course Entitlements 2017-12-15 11:32:33 -05:00
Matt Tuchfarber
01ac2da100 Make FAQ full width, not columns 2017-12-15 11:15:14 -05:00
Waheed Ahmed
ad5a539cea Merge pull request #16911 from edx/waheed/LEARNER-3239-add-save-button-with-profile-visibility 
Add save button with profile visibility dropdown.
 2017-12-15 19:34:26 +05:00
Harry Rein
4cccfca8dc Merge pull request #16834 from edx/HarryJeff/LEARNER-3304-policy-front-end 
Policy Front end on the Course Dashboard
 2017-12-15 09:27:04 -05:00