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

158 Commits

Author SHA1 Message Date
McKenzie Welter
a4d23eaea9 include email settings in fulfilled entitlement action items 2017-12-20 08:57:27 -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
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
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
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
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
Harry Rein
54734841a2 Remove dependency on Popper.js 2017-12-13 12:45:08 -05:00
Harry Rein
791b8b141e Importing bootstrap and popper through webpack. 2017-12-12 14:50:38 -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
Harry Rein
a9a255e3c8 Load popper and bootstrap through a script tag to reduce flakiness on stage. 2017-12-11 13:23:29 -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
Nimisha Asthagiri
7ef443f7ce Update usages to ace_common 2017-12-05 11:38:16 -05:00
Gabe Mulley
6f20cd5cf2 support a GA tracking pixel 2017-11-15 08:35:35 -05:00
Gabe Mulley
54ae1c6238 support theming of ACE emails 2017-11-09 11:16:26 -05:00
Ned Batchelder
a6254d5049 Merge pull request #16434 from edx/nedbat/openedx-favicon 
A new favicon for Open edX
 2017-11-05 17:51:34 -05:00
Ned Batchelder
2499dc95c2 A new favicon for Open edX 2017-11-03 14:14:28 -04:00
Harry Rein
22e05f622e Merge branch 'master' into release-mergeback-to-master 2017-11-02 13:33:03 -04:00
Harry Rein
63eeca73ce Removing waffle flag for responsive header. 2017-11-01 21:36:32 -04:00
Bill Filler
2c6f2f6578 fix dashboard error on edx.org theme 2017-11-01 15:43:06 -04:00
hamzamunir7300
9c85fcad78 Merge pull request #15988 from edx/footer_design_WIP/LEANER-2311 
Footer New design using bootstrap
 2017-10-30 16:00:18 +05:00
Hamza Munir
4a3164e2e3 Footer New design using bootstrap 
This is a work in progress finished the 320px - 539px mobile
screen design.

LEARNER-2311
 2017-10-30 14:55:26 +05:00
Andy Armstrong
ae1c760ea4 Use Bootstrap theme colors and fonts in old stylesheets 
LEARNER-2977

Fixes
 2017-10-29 22:22:08 -04:00
Harry Rein
889e9880f5 Responsive dashboard and learner profile. 2017-10-24 11:08:35 -04:00
Harry Rein
3d79e3e05d Adding unified, responsive header. 2017-10-20 16:24:31 -04:00
Harry Rein
ec17971a2b Orders course goals and updates styling. 
LEARNER-2860
 2017-10-18 16:57:57 -04:00
muzaffaryousaf
ef8b2994cc Fix quality issues to get green build for master. 2017-10-17 16:33:58 +05:00
Andy Armstrong
bd1a0d96cf More Sass quality fixes 2017-10-16 12:41:20 -04:00
Michael LoTurco
96dbd26f83 Added edx-themed certificate template partials for learner-1996 2017-10-13 11:02:20 -04:00
Matthew Piatetsky
c741bcbee7 Implement local currency in lms 
LEARNER-2412
 2017-10-11 14:37:18 -04:00
Andy Armstrong
374cdb0a3d Convert course home page to Bootstrap 
LEARNER-1694

Fix a11y failure

Fix header styling

Fix layout issues

Further layout fixes
 2017-10-10 20:18:27 -04:00
Diana Huang
de7e1ead7d Clicking the logo brings the user back to the dashboard. 2017-09-25 17:06:08 -04:00
Diana Huang
1cfefe2457 Modify the header to show the learner profile. 
Remove the profile from the user dropdown.

LEARNER-2318
 2017-09-25 17:06:08 -04:00
Andy Armstrong
94add3a49f Provide a first class Open edX theme 
LEARNER-2513
 2017-09-07 13:44:02 -04:00
Andy Armstrong
6e10d2a556 Update to use Bootstrap beta release 
FEDX-375
 2017-09-06 22:49:05 -04:00
Andy Armstrong
6f888d6995 Add course certificates on the learner profile 
LEARNER-1860
 2017-08-31 20:58:35 -04:00
Matthew Piatetsky
dcee785543 Fix selectors so that unenrollment survey works with multiple courses 2017-08-22 17:31:50 -04:00
Matthew Piatetsky
7c0423ff03 Revert revert of unenrollment survey. 
This reverts commit e2ee48c3c9.
 2017-08-22 16:33:05 -04:00
Matthew Piatetsky
e2ee48c3c9 Revert "Un-revert unenrollment survey and only show it for edx.org users" 2017-08-22 13:40:25 -04:00
Matthew Piatetsky
25ffb3568c Update unenrollment survey to only be included for edx.org and rebase with master 2017-08-22 10:12:01 -04:00
Adeel Khan
e966188ba6 Improve ECOM connection on student dashboard via on demand ajax calls. 
Fix course unenroll dialog's incorrect message rendering. LEARNER-2033
 2017-08-17 18:18:04 +05:00
Andy Armstrong
d75beaf9cd Fix the edx.org theme location for Xsy images 
LEARNER-2217
 2017-08-14 13:42:38 -04:00
Andy Armstrong
0f808cec78 Implement theme admin UI to support previewing 
LEARNER-2017
 2017-07-27 17:24:31 -04:00
Harry Rein
666db5cc0d Fixing whitelabel messaging issue. 
WL-1147

Switching edx.org and openedx images.
 2017-07-26 17:10:07 -04:00
Matthew Piatetsky
bfa8f4f436 CSS/JS fixes to Track Selection V3 Test 
LEARNER-1726
 2017-07-25 09:48:46 -04:00
Harry Rein
b523ac3f91 Merge pull request #15589 from edx/HarryRein/LEARNER-1894-in-course-messaging-xsy 
Adding in-course messages on the home page.
 2017-07-24 16:06:52 -04:00
Harry Rein
08df53e110 Adding in course messaging to the home page. 
LEARNER-1894

This commit adds in course messaging for three use cases. First,
when the user is not signed in, the user is shown a message that
provides a link to sign in or register. If the user is signed in
but not enrolled, they are given a link to do so. If the user is
enrolled but the course has not yet started, they are shown a
message explaining when the course starts and shown a link (not
yet enabled) to add a reminder to their calendar.

The implementation defines a base message class and extends it
for the course home messages as well as the previously implemented
page level messages.
 2017-07-24 15:17:12 -04:00
Andy Armstrong
95e47ddb02 Add basic Bootstrap theme to Studio 
LEARNER-1982
 2017-07-24 10:43:18 -04:00
Matthew Piatetsky
c8250fd573 Implement track selection v3 test 
LEARNER-1726
 2017-07-21 13:17:24 -04:00