Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bmedx
bad68f8b1e Add default OAUTH_DELETE_EXPIRED to LMS settings 2017-09-01 11:06:54 -04:00
bmedx
8aabd27081 Add zh_HANS language mapping to pdfjs and EDX_README 2017-09-01 10:56:35 -04:00
Gabe Mulley
873f7cbd8d restrict ace deps 2017-09-01 10:44:05 -04:00
Saleem Latif
8fe73a9b3e edx-enterprise version upgrade to 0.42.0 2017-09-01 10:24:45 -04:00
Andy Armstrong
ff5c6f0c30 Merge pull request #15868 from edx/andya/profile-certificates 
LEARNER-1860: Course certificates on the learner profile
 2017-09-01 07:12:03 -04:00
Andy Armstrong
6f888d6995 Add course certificates on the learner profile 
LEARNER-1860
 2017-08-31 20:58:35 -04:00
Nimisha Asthagiri
c08060a0bb Merge pull request #15745 from edx/ret/triggered-email 
RET triggered emails
 2017-08-31 20:44:43 -04:00
Eric Fischer
a403fd1491 Merge pull request #15939 from edx/efischer/ora_204 
edx-ora2 2.0.4 release
 2017-08-31 19:49:26 -04:00
Eric Fischer
d02c580123 edx-ora2 2.0.4 release 2017-08-31 17:21:24 -04:00
Gabe Mulley
6a36eb0183 Use ACE to 'send' Recurring Nudge emails 2017-08-31 16:58:08 -04:00
Uman Shahzad
b31287e264 Merge pull request #15897 from open-craft/uman/bump-ent-0.41.0 
[ENT-496] Bump edx-enterprise to 0.41.0.
 2017-09-01 00:21:54 +05:00
Albert (AJ) St. Aubin
44b0738c84 Merge pull request #15928 from edx/aj/LEARNER-2420 
update to resolver complete my program purchase to work with no-id-pr…
 2017-08-31 14:51:22 -04:00
Albert St. Aubin
004f4b75a4 update to resolver complete my program purchase to work with no-id-professional 
LEARNER-2420
 2017-08-31 13:54:33 -04:00
Tasawer Nawaz
146d813a86 Merge pull request #15934 from edx/tasawer/learner-2430-fix-a11y-issues-on-unenroll-menu 
Fixed a11y on course actions dropdown menu on dashboard
 2017-08-31 22:49:03 +05:00
Brittney Exline
c79be5bbc1 Merge pull request #15929 from edx/bexline/clean_saml_usernames 
ENT-619 Clean usernames coming from identity providers
 2017-08-31 13:09:42 -04:00
Brittney Exline
716a608f76 adding suggested test case 2017-08-31 10:56:07 -04:00
Uman Shahzad
197c06a1e4 Bump edx-enterprise to 0.41.0. 
This incorporates a migration that copies data
from certain models to another.
 2017-08-31 10:41:45 -04:00
Jesse Zoldak
c9ad66df5d Merge pull request #15935 from edx/zoldak/EDUCATOR-1282 
Remove flaky bok choy test test_perform_problem_reset_and_navigate
 2017-08-31 10:41:45 -04:00
Jesse Zoldak
b77b06ecc2 Remove flaky bok choy test test_perform_problem_reset_and_navigate 2017-08-31 09:19:44 -04:00
attiyaishaque
32691b5b1a EDUCATOR-1267 Add logs in importing the course. 2017-08-31 12:53:41 +05:00
tasawernawaz
0c3c78b765 Fixed a11y on course actions dropdown menu on dashboard 
LEARNER-2430
 2017-08-31 10:41:04 +05:00
Clinton Blackburn
0a6029f7a7 Added verified upgrade hero to course run homepage 
Audit learners are now shown a prompt to upgrade to the verified track
of the course run. This message goes away after the learner upgrades.
 2017-08-30 17:01:27 -04:00
Ned Batchelder
ee01e3e0b7 Merge pull request #15909 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-08-30 16:38:54 -04:00
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
Ned Batchelder
96ad386d36 Update translations (autogenerated message) 2017-08-30 18:01:15 +00: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
Brittney Exline
f844510b71 ENT-619 Clean usernames coming from identity providers 
Since we have started integrating with more clients, we have found that the usernames
that get passed are not compatible with our username restrictions. This PR introduces
a function to clean usernames to make them compatible, particularly in the auto registration
case.
 2017-08-30 13:36:57 -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
Ned Batchelder
63364fd305 Update translations (autogenerated message) 2017-08-30 16:12:38 +00: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
Jesse Shapiro
b494ab7dba Show advertised start date on course details page 2017-08-29 15:45:00 -04: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