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

42483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ibrahim
bcbd366fc9 Program dashboard page layout update 2017-08-30 16:52:37 +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
Alex Dusenbery
0fe31fa981 EDUCATOR-1251 | cert available date validation should take course pacing into account. 2017-08-29 13:54:21 -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
Noraiz Anwar
03abf94a80 Merge pull request #15916 from edx/revert-15889-mroytman/EDU-1134 
Revert "remove try/catch block and associated test for EDUCATOR-1134"
 2017-08-29 22:47:16 +05:00
Jeremy Bowman
565ec7a541 Merge pull request #15918 from edx/jmbowman/test_reliability_fixes 
Fix tests that depend on execution order
 2017-08-29 13:46:59 -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
Alex Dusenbery
167e4d582f Remove flaky DragAndDropTest class. 2017-08-29 12:37:08 -04:00
Douglas Hall
42d462a957 Merge pull request #15913 from edx/zub/ENT-600-update-sap-odata-log-message 
add error message in odata api log
 2017-08-29 11:15:03 -04:00
Jeremy Bowman
0d7806e0cd Fix tests that depend on execution order 2017-08-29 11:08:47 -04:00
Noraiz Anwar
d13928559a Revert "remove try/catch block and associated test for EDUCATOR-1134 followin…" 2017-08-29 19:43:01 +05: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
zubair-arbi
64152e6841 add error message in odata api log 
ENT-600
 2017-08-29 19:10:22 +05:00
Michael Frey
508aa7f3a3 Merge pull request #15914 from edx/mjfrey/increase-rate-limit 
increase staff rate limit on enrollment API.
 2017-08-29 10:00:43 -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
Michael Frey
8604a11c1f increase staff rate limit on enrollment API. 2017-08-29 08:52:27 -04: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
Uzair Rasheed
0495d70b46 Merge pull request #15890 from edx/LEARNER-1466/WL-email 
Fix email will not sent to white-label users
 2017-08-29 01:01:43 +05: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
Douglas Hall
3a65cedf23 Merge pull request #15895 from edx/saleem-latif/ENT-605 
ENT-605: On edx.org instances, next URL for login page cannot contain 'edx.org'.
 2017-08-28 10:37:23 -04:00
Robert Raposa
04cb66edf4 Merge pull request #15903 from edx/robrap/reduce-thresholds 
Reduce xss lint thresholds.
 2017-08-28 10:30:11 -04: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
Robert Raposa
8f184c257d Reduce xss lint thresholds. 2017-08-28 09:20:17 -04:00
Ibrahim
165954b12c fix layout issues in Program dashboard page 
WL-1186
 2017-08-28 17:39:45 +05:00
Ned Batchelder
fcb6e7cbba Merge pull request #15900 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-08-25 19:23:19 -04: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
Douglas Hall
010d251da7 Merge pull request #15893 from edx/douglashall/upgrade_enterprise_0_40_7 
Upgrade edx-enterprise to 0.40.7.
 2017-08-25 11:01:04 -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
Saleem Latif
f087672d4b On edx.org instances, next URL for login page cannot contain 'edx.org'. 2017-08-25 17:31:35 +05: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
Douglas Hall
6904fafc4a Upgrade edx-enterprise to 0.40.7. 
https://github.com/edx/edx-enterprise/compare/0.40.6...0.40.7

ENT-612
 2017-08-24 12:46:47 -04:00
Feanil Patel
d6e75a8523 Merge pull request #15862 from open-craft/cliff/pb-migrate-keys 
Update problem-builder requirement to 2.6.5patch2 to migrate keys.
 2017-08-24 11:57:26 -04:00
Calen Pennington
ceb0814fff Force the CourseKey alter tables to be noops from the SQL perspective 2017-08-24 11:38:05 -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
Adam
5bc66274c3 Merge pull request #15849 from edx/fix-cg-dangling-pointer 
have coursegraph cache nodes on block_ids rather than locations (EDUC…
 2017-08-24 11:13:24 -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
Michael Roytman
c27af617ea Merge pull request #15889 from edx/mroytman/EDU-1134 
remove try/catch block and associated test for EDUCATOR-1134 followin…
 2017-08-24 09:51:18 -04:00
Waheed Ahmed
54b50341bd Modified migrations sync test. 2017-08-24 11:58:17 +05: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
Alex Dusenbery
821253bf2b EDUCATOR-1232 | front end validation of certificate available date field. 2017-08-23 16:46:03 -04:00
Eric Fischer
e534169fe8 Merge pull request #15829 from edx/efischer/EDU-1142 
Fix Proctoring doc link
 2017-08-23 16:34:12 -04:00