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

6153 Commits

Author SHA1 Message Date
noraiz-anwar
9d2fad7144 fix course staff ability to perform operations on instructor dashboard 2018-01-02 14:34:38 +05:00
Michael Terry
dce5da581c Merge pull request #17032 from edx/mikix/LEARNER-3709 
Fix a11y issues on course dashboard
 2017-12-27 10:51:47 -05:00
edx-pipeline-bot
48f2431618 Merge pull request #17014 from edx/release-mergeback-to-master 
Merge release back to master
 2017-12-22 13:16:39 -05:00
Michael Terry
fe014690ef Fix a11y issues on course dashboard 
Remove a broken and unneeded aria-controls= attribute and make an
id= attribute unique.

LEARNER-3709
 2017-12-22 13:11:32 -05:00
Fred Smith
37dc15779a Merge pull request #17013 from edx/McKenzieW/learner-3704 
fix entitlement email settings list item class
 2017-12-22 08:08:57 -05:00
Harry Rein
579435bcd7 Merge branch 'master' into release-mergeback-to-master 2017-12-21 16:50:24 -05:00
McKenzie Welter
9cc4b4b609 fix entitlement eemail settings list item class 2017-12-21 16:40:09 -05:00
McKenzie Welter
a422190ec9 Revert "fix list item class" 
This reverts commit 42143114a5.
 2017-12-21 16:36:04 -05:00
McKenzie Welter
42143114a5 fix list item class 2017-12-21 16:32:03 -05:00
Harry Rein
b09f4fabf1 Show more sessions coming soon for entitlements without sessions. 2017-12-21 15:38:45 -05:00
Muhammad Ammar
b6f45955f5 Merge pull request #15803 from open-craft/replaceafill/OC-2594 
Auto-advance video toggle
 2017-12-22 01:29:24 +05:00
Waheed Ahmed
45272811c4 Fix optout email settings checkbox. 
Course optouts value list was returning opaque_key objects and
during rendering unicode object was used to generate the
optout settings bool value.

LEARNER-3066
 2017-12-21 17:28:40 +05:00
Daniel Clemente
ecf01d1b52 Adds a course option to auto-advance videos. 
If enabled for a course, as soon as the video ends, the next unit or subsection
will be loaded, and if it contains a single video, that video will be played.

Course authors can enable the setting for a course, but learners can toggle the
setting on or off once it's enabled on the course.
 2017-12-21 21:06:05 +10:30
Harry Rein
0d1558237f Hide policy information when leaving a session. 
LEARNER-3692
 2017-12-20 14:02:04 -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
McKenzie Welter
a4d23eaea9 include email settings in fulfilled entitlement action items 2017-12-20 08:57:27 -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
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
Harry Rein
908c769ae3 Update entitlement card to use Change or Leave Session. 
LEARNER-3646
 2017-12-19 10:26:17 -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
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
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
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
Matt Tuchfarber
70566b5d9d Fix double headers or WL registration page 2017-12-18 13:33:49 -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
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
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
Michael Terry
15d80c7bb3 Merge pull request #16854 from edx/mikix/LEARNER-3504 
Show related programs when unenrolled
 2017-12-11 16:12:12 -05:00
Michael Terry
25076e6a92 Show related programs when unenrolled 
On the course dashboard, show related programs to your course
even if you are not enrolled in a current session.

LEARNER-3504
 2017-12-11 14:52:36 -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
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
Diana Huang
0ecc0558a3 More registration form cleanup. 2017-12-08 09:39:01 -05:00
Waheed Ahmed
3ed08e3b35 Implement journeys app banner. 
Banners will enable the deep linking functionality for
mobile apps.

LEARNER-2731
 2017-12-08 18:33:47 +05:00
zubair-arbi
2ac544caeb Update account settings page for enterprise learners 
ENT-762
 2017-12-08 15:40:18 +05:00