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

16756 Commits

Author SHA1 Message Date
Ibrahim Ahmed
daaf31fd37 Merge pull request #15925 from edx/ibrahimahmed443/WL-1186-program-dashboard-layout-update 
Program dashboard page layout update
 2017-08-30 20:54:25 +05:00
Tasawer Nawaz
120bf907f9 Merge pull request #15912 from edx/tasawer/learner-2305/fix-a11y-issues-on-unenroll-dialogbox 
Fixed tab issue on unenroll dialog.
 2017-08-30 20:34:44 +05:00
Ibrahim
bcbd366fc9 Program dashboard page layout update 2017-08-30 16:52:37 +05:00
Hasnain Naveed
e4deef9dd6 Merge pull request #15451 from edx/mjevtic/remove-waffle-switches 
LEARNER-1146 | Remove populate-multitenant-programs waffle switch
 2017-08-30 15:06:46 +05:00
Harry Rein
f42e6f1c5d Merge pull request #15826 from edx/HarryRein/LEANER-1859-social-profile-links 
LEARNER-1859: social profile links
 2017-08-29 14:43:30 -04:00
Harry Rein
9f88427f9b Add social links to learner profile. 
LEARNER-1859

Added fields to add social links to the user account settings file.
Added icons to the user profile when these links are set, only shown
when users show their entire profile. Added jasmine tests for account
settings and learner profile pages. Added python unit tests to test
validation on the user account.
 2017-08-29 13:53:08 -04:00
Jeremy Bowman
00c4ede8ee Merge pull request #15831 from edx/jmbowman/PLAT-1710 
PLAT-1710 Support lettuce tests in Docker Devstack
 2017-08-29 13:25:58 -04:00
Omar Al-Ithawi
d0c7a532ad Make the platform name translatable 2017-08-29 12:43:36 -04:00
Ari Rizzitano
19dec17e7b Merge pull request #15806 from edx/ari/ss-review-report 
expand proctored exam report to include violation summary
 2017-08-29 10:10:50 -04:00
Waheed Ahmed
dd95861177 Merge pull request #15911 from edx/waheed/LEARNER-2201-create-delete-migration 
Create migration to remove field 'sailthru_activation_template' from DB table.
 2017-08-29 18:36:49 +05:00
Nimisha Asthagiri
d23ed5e2e4 Merge pull request #15878 from edx/ret/foreign-key-course-key 
Ret/foreign key course key
 2017-08-29 09:00:51 -04:00
tasawernawaz
c47806a816 Fixed tab issue on unenroll dialog 
LEARNER-2305
 2017-08-29 17:25:01 +05:00
Waheed Ahmed
7d5446125d Create migration to remove 'sailthru_activation_template' from DB. 
Follow up PR for PR-15863 to remove the field from database table.

LEARNER-2201
 2017-08-29 13:07:28 +05:00
George Song
0c204e3520 Merge pull request #15641 from jspayd/toggle-timer-upstream 
Toggle timer visibility on timed exams
 2017-08-28 18:39:41 -04:00
uzairr
1aea33cefc Fix email will not sent to white-label users 
White label partners reported that the users are receiving edX
welcome emails at the time of signup.To solve it, a check is added
that will assure, only edX users will receive the welcome email.

LEARNER-1466

changes requested

update

update

updated
 2017-08-28 14:55:24 +00:00
Ibrahim Ahmed
47311e1942 Merge pull request #15902 from edx/ibrahimahmed443/WL-1186-program-dashboard-layout 
fix layout issues in Program dashboard page
 2017-08-28 19:23:59 +05:00
Ibrahim
165954b12c fix layout issues in Program dashboard page 
WL-1186
 2017-08-28 17:39:45 +05:00
Ned Batchelder
92c406e46a Update translations (autogenerated message) 2017-08-25 17:21:52 -04:00
Alex Dusenbery
9009a5b0d3 may_certify_for_course checks if course is self_paced. 2017-08-25 14:37:53 -04:00
Robert Raposa
c32d8a62d0 Merge pull request #15866 from edx/diana/update-events 
LEARNER-2025: Update event naming for course sock.
 2017-08-25 09:14:24 -04:00
Waheed Ahmed
100b5aa5dd Merge pull request #15863 from edx/waheed/LEARNER-2201-remove-deprecated-field 
Remove deprecated field 'sailthru_activation_template'.
 2017-08-25 12:28:23 +05:00
Diana Huang
086e15c9b6 Update event naming for course sock. 
Only show course sock to English readers.
 2017-08-24 16:36:28 -04:00
Matthew Piatetsky
dc576c6c2a Merge pull request #15888 from edx/LEARNER-1510 
Add back expression filter
 2017-08-24 16:32:38 -04:00
Albert (AJ) St. Aubin
eff07af1c1 Merge pull request #15891 from edx/aj/LEARNER-2352 
Corrected issue with missing Certificated on Program Dashboard View
 2017-08-24 13:42:35 -04:00
Albert St. Aubin
eab62e786f Corrected issue with missing Certificated on Program Dashboard View 
LEARNER-2352
 2017-08-24 11:17:43 -04:00
Tyler Hallada
2298bd2553 Merge pull request #15791 from edx/EDUCATOR-926 
EDUCATOR-1127 Override grade to zero when exam attempt is rejected Final
 2017-08-24 10:50:56 -04:00
Sofiya Semenova
65ee2ebbaf Merge pull request #15833 from edx/ssemenova/ed-801 
EDUCATOR-801 Certificate issued date should be the certificate availability date for instructor-paced courses
 2017-08-24 10:22:29 -04:00
Waheed Ahmed
b069020710 Remove deprecated field 'sailthru_activation_template'. 
LEARNER-2201
 2017-08-24 11:58:16 +05:00
Sofiya Semenova
c7fc1929f2 ED-801 Certificate issued date should display the certificate availability date for instructor paced coursest 2017-08-23 17:07:43 -04:00
sanfordstudent
fdfd577a61 Merge pull request #15884 from edx/sstudent/hide_cert_available_self_paced 
cert available date hidden in self paced
 2017-08-23 15:28:15 -04:00
Calen Pennington
0faa683776 Update access to deprecated enrollment.course (which now doesn't create the CourseOverview transparently) 2017-08-23 15:24:44 -04:00
Calen Pennington
84075efc81 Convert CourseKeyField to ForeignKey(CourseOverview) on enrollments and course modes 2017-08-23 15:24:43 -04:00
Matthew Piatetsky
5f91b72780 Add back expression filter 2017-08-23 15:14:36 -04:00
Calen Pennington
3aa02f2913 Merge pull request #15880 from edx/ret/remove-extraneous-request-argument 
Remove extraneous request argument to experiments.utils.check_and_get…
 2017-08-23 14:53:26 -04:00
Calen Pennington
6c9b38dcfd Merge pull request #15877 from edx/ret/course-mode-factory 
Use a consistent CourseModeFactory from the course_modes module, rath…
 2017-08-23 14:16:54 -04:00
Sanford Student
d0b2787f24 TNL-1230: cert available date hidden in self paced 2017-08-23 13:58:48 -04:00
Calen Pennington
63244b514d Use a consistent CourseModeFactory from the course_modes module, rather than using one from student 2017-08-23 12:15:46 -04:00
Ari Rizzitano
f39833c709 expand proctored exam report to include violation summary 
EDUCATOR-411

hit new report endpoint
EDUCATOR-411

bad syntax

python join != js join

csv headings list too long for task

fix string formatting

fix wrong set of keys

bump edx-proctoring to 1.2.0
 2017-08-23 11:10:13 -04:00
Calen Pennington
127e90e3a3 Remove extraneous request argument to experiments.utils.check_and_get_upgrade_link 2017-08-23 10:38:39 -04:00
Hasnain
bb33a3aa25 LEARNER-1146 | Removed the flag and their corresponding code. 2017-08-23 14:58:47 +05: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
Diana Huang
40a5b066dc Merge pull request #15843 from edx/robrap/LEARNER-1858-show-join-date-2 
Support for joined date to profile.
 2017-08-22 15:43:49 -04:00
ayub-khan
e737728cde Updated Country Label and help text 
Country Label was causing confusions for learners if it was country of origin or in which they
are living so changed it to a more appropriate message.
LEARNER-174
Also updated some other error messages to some more appropriate error messages.
 2017-08-22 23:20:35 +05: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
Alex Dusenbery
2cc87952e3 EDUCATOR-1204 | can always view certs when ready for self-paced courses; don't hide cert buttons; update messaging. 2017-08-22 13:27:26 -04:00
Robert Raposa
7cc9400b91 Support for joined date to profile. 
LEARNER-1858
 2017-08-22 12:52:37 -04:00
Gregory Martin
b8aa3052ae Merge pull request #15813 from edx/yro/update_cert 
Update Certificate Task Call
 2017-08-22 12:42:43 -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
Matthew Piatetsky
98cf69bac5 Revert "Revert "LEARNER-1510 Add unenrollment reason survey"" 
This reverts commit 441bccf4b6.
 2017-08-22 10:12:01 -04:00