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

4620 Commits

Author SHA1 Message Date
Michael Terry
4e05d43345 Fix login box alignment in IE 
In IE 11, the login page form was being shown right-aligned on the
page. This is because of some IE interaction with margin: auto.
Removing that and relying on flexbox flow fixes it and makes the
form centered again.

LEARNER-3001
 2017-12-29 11:36:49 -05:00
ayub-khan
f50af67f15 updated translations 2017-12-27 16:38:58 +05:00
Michael Terry
c065707e5d Fix button alignment on program dash 
The View Course button on the program dashboard was not right-aligned
with the rest of the UI. Now it is.

LEARNER-3733
 2017-12-22 11:17:58 -05:00
Michael Terry
29bacacaa3 Merge pull request #17000 from edx/mikix/LEARNER-3665 
Correctly align Verify Now button
 2017-12-21 14:14:18 -05:00
Michael Terry
09468f3f0e Merge pull request #16999 from edx/mikix/LEARNER-3668 
Don't wrap enroll button text
 2017-12-21 14:14:03 -05:00
Michael Terry
484cdbde6b Correctly align Verify Now button 
LEARNER-3665
 2017-12-21 13:05:38 -05:00
Michael Terry
f630848bef Don't wrap enroll button text 
The "Leave Current/Switch/Select" Session button was sometimes
wrapping its text if it wasn't given enough horizontal space.
Now it should never wrap, instead stealing space from the
dropdown next to it (or being bumped to a line below the dropdown).

LEARNER-3668
 2017-12-21 12:44:07 -05:00
Michael Terry
4a6048e3c7 Keep related programs when unenrolling 
When unenrolling, let's not remove the related programs div
permanently from the page, since it should always be visible.

LEARNER-3717
 2017-12-21 11:21:12 -05:00
Harry Rein
0d1558237f Hide policy information when leaving a session. 
LEARNER-3692
 2017-12-20 14:02:04 -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
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
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
Anthony Mangano
fdadd4cdf4 Fix a11y issues with unenroll modal 2017-12-18 16:44:09 -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
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
Saleem Latif
86da9c1c63 Disable linking of personal accounts to enterprise customers via SSO 2017-12-18 15:12:42 +05:00
Anthony Mangano
a6cb0fef1c add dashboard entitlement actions 2017-12-15 13:37:06 -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
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
610c255bb6 Display the expired at logic for entitlements. 
LEARNER-3304

Displays the expired out status for the course dashboard and the programs pages.
 2017-12-15 08:25:38 -05:00
Waheed Ahmed
cd65d720ad Add save button with profile visibility dropdown. 
When a learner changes this dropdown from Full to Limited or
vice versa, nothing happens. This creates confusion, to fix
that add save button.

LEARNER-3239
 2017-12-15 13:03:33 +05:00
Matthew Piatetsky
000bbaf02f Add bundle purchase button to course dashboard 2017-12-14 17:06:52 -05:00
Waheed Ahmed
67752c39cc Merge pull request #16305 from edx/waheed/LEARNER-2730-text-me-the-app 
Create custom Text Me The App landing page.
 2017-12-14 12:50:00 +05:00
Harry Rein
310279c704 Merge pull request #16905 from edx/HarryRein/reenabling-jasmine-tests-entitlements 
Reenabling Entitlement Jasmine tests.
 2017-12-13 15:33:42 -05:00
Harry Rein
7380bcd70c Reenabling Entitlement Jasmine tests. 
LEARNER-3483
 2017-12-13 13:31:30 -05:00
Harry Rein
a0df76e19e Merge pull request #16903 from edx/HarryRein/entitlements-jasmine-tests-requireJS 
Remove dependency on Popper.js
 2017-12-13 13:04:52 -05:00
Harry Rein
54734841a2 Remove dependency on Popper.js 2017-12-13 12:45:08 -05:00
Bill Filler
dd4d13af5f Merge pull request #16611 from edx/afzaledx/WL-1219 
Added extended profile fields to the Account settings page.
 2017-12-13 08:48:06 -05:00
Waheed Ahmed
efe4120b8f Create custom Text Me the App landing page. 
Rebrand the branch.io text me the app landing page to reflect edX's style.

LEARNER-2730
 2017-12-13 17:10:32 +05:00
Brittney Exline
c0ce7cf69a Merge pull request #16880 from edx/bexline/registration_fix_ie11 
ENT-800 Fix IE11 Broken Submit button on Registration Page
 2017-12-12 16:25:01 -05:00
Brittney Exline
c110a9ac21 ENT-800 Fix IE11 Broken Submit button on Registration Page 2017-12-12 11:58:00 -05:00
Harry Rein
19406fa48f Removing RequireJS imports of bootstrap and popper. 2017-12-12 11:07:11 -05:00
Harry Rein
2711fb521a Allowing a user to fulfill their entitlement on the programs dashboard. 
LEARNER-3438

The user can now enroll in a session, unenroll from a session or change session
from a new course enrollment card on the programs dashboard.
 2017-12-12 10:35:26 -05:00
Douglas Hall
cd70023141 Merge pull request #16861 from edx/douglashall/ENT-796 
Fix optional registration fields toggle.
 2017-12-11 20:10:19 -05:00
Douglas Hall
ede8ee4a5b Fix optional registration fields toggle. 
We need to account for optional fields that may get rendered
as hidden input elements due to the configuration of the
registration form when deciding whether or not to display
the optional registration fields toggle checkbox.

ENT-796
 2017-12-11 16:14:18 -05:00
Harry Rein
a9a255e3c8 Load popper and bootstrap through a script tag to reduce flakiness on stage. 2017-12-11 13:23:29 -05:00
Afzal Wali
f589dc9d29 WL-1219 
Added extended profile fields to the Account settings page.
 2017-12-11 18:42:59 +05:00
Eric Fischer
f63cf61a9d cleanup regex 2017-12-08 14:39:02 -05:00
Eric Fischer
5bc6b31e29 eslint --fix 2017-12-08 14:38:41 -05:00
Michael Frey
e0112d18e3 Merge pull request #16842 from edx/HarryRein/popover-styling 
Fix styling on the popover.
 2017-12-08 14:18:28 -05:00
Sofiya Semenova
b4a4318d1a Merge pull request #16705 from edx/sofiya/1552 
Educator 1552 Implement roving tabindex for WYSIWYG editor for discussions
 2017-12-08 13:24:07 -05:00
Diana Huang
8752480aac Merge pull request #16829 from edx/diana/registration-form-improvements 
LEARNER-3469 - More registration form cleanup.
 2017-12-08 13:00:20 -05:00
Harry Rein
2162b966d0 Fix styling on the popover. 2017-12-08 12:28:06 -05:00
Sofiya Semenova
a1f0679f3a Educator 1552 - Implement roving tabindex for WYSIWYG editor for discussions 2017-12-08 11:18:11 -05:00
Diana Huang
0ecc0558a3 More registration form cleanup. 2017-12-08 09:39:01 -05:00
zubair-arbi
2ac544caeb Update account settings page for enterprise learners 
ENT-762
 2017-12-08 15:40:18 +05:00
Albert St. Aubin
28837c020f Allowing a user to fulfill their entitlement on the course dashboard. 
The user can now enroll in a session, unenroll from a session or change session
from a new course enrollment card on the course dashboard.
 2017-12-07 12:41:12 -05:00
ayub-khan
96984aa3a4 updated translations 7 dec 2017-12-07 17:17:16 +05:00