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

42502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bessie Steinberg
626ba02d4e Merge pull request #15851 from edx/bessiesteinberg/WL-1098 
Add profession & specialty fields to registration page
 2017-08-30 16:05:52 -04:00
Gregory Martin
1d1fcb8247 Merge pull request #15932 from edx/yro/string_fix 
Update to Certs Date String
 2017-08-30 16:01:40 -04:00
George Song
1cca42d372 Merge pull request #15931 from edx/efischer/revert 
Revert "Merge pull request #15641 from jspayd/toggle-timer-upstream"
 2017-08-30 12:48:01 -07:00
Gregory Martin
18e21ff9c7 Update 2017-08-30 15:04:33 -04:00
Eric Fischer
e32615e132 Revert "Merge pull request #15641 from jspayd/toggle-timer-upstream" 
This reverts commit 0c204e3520, reversing
changes made to 0495d70b46.
 2017-08-30 14:33:18 -04:00
Bessie Steinberg
b1c7cdf415 Add profession & specialty fields to register page 
The site configurations can now set 'Profession' and 'Specialty' as
fields on the registration page.  The list of potential professions and
specialties to choice from can also be set from the site configurations
by setting 'PROFESSION_OPTIONS' and 'SPECIALTY_OPTIONS'.

WL-1098
 2017-08-30 14:20:11 -04:00
sanfordstudent
4c98c884e6 Merge pull request #15908 from edx/sstudent/state-deletion 
account for delete state in grading code
 2017-08-30 14:15:17 -04:00
Gregory Martin
729127c3aa Merge pull request #15920 from edx/yro/disable_nocertificate_date 
Deactivate date display if no cert active
 2017-08-30 13:46:53 -04:00
Sanford Student
2d3e9dd12c account for delete state in grading code 2017-08-30 13:20:52 -04:00
Ayub khan
e56966c147 Merge pull request #15896 from edx/LEARNER-2294 
Remove basket creation calls for audit orders from commerce and remove waffle flag used to stop those calls
 2017-08-30 22:12:45 +05:00
Gregory Martin
43e14b9142 Deactivate date display if no cert active 
EDUCATOR-1234
 2017-08-30 12:23:58 -04:00
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
Jeremy Bowman
fa623f3faf Merge pull request #15919 from edx/jmbowman/testcase_usage 
Clean up TestCase subclassing
 2017-08-30 10:16:07 -04:00
ayub-khan
32679b0423 Removed waffle flag on commerce api for default_enrollment_mode 
Removed ecommerce calls for default_enrollment_mode order creation
Removed tests related to those
LEARNER-2294
 2017-08-30 18:13:02 +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
Jeremy Bowman
32000c7a98 Clean up TestCase subclassing 2017-08-29 15:38:48 -04: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
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
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