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

15045 Commits

Author SHA1 Message Date
Douglas Hall
10a065990b Merge pull request #16064 from open-craft/uman/ent-0.46.5 
[ENT-644] Bump edx-enterprise to 0.46.7.
 2017-09-22 05:47:16 -04:00
Uman Shahzad
6355604b51 Ignore pending migrations for edx-enterprise temporarily. 2017-09-22 05:17:18 +05:00
sanfordstudent
5c88600fbf Merge pull request #16048 from edx/sstudent/EDUCATOR-1288 
Sstudent/educator 1288
 2017-09-21 16:48:46 -04:00
Sanford Student
d0e68f2d24 recalculate course grade on user partition change 2017-09-21 15:32:07 -04:00
Andy Armstrong
c68ad09773 Merge pull request #16002 from edx/andya/studio-sass-linting 
Fix validation issues with Studio Sass files
 2017-09-20 20:57:37 -04:00
Sofiya Semenova
2faf3b1dfe Merge pull request #16052 from edx/ssemenova/flakey-test 
Remove flaky SettingsMilestonesTest.test_enable_entrance_exam_for_course
 2017-09-20 14:59:14 -04:00
Douglas Hall
247f2835c1 Merge pull request #16060 from edx/revert-16001-zub/ENT-624-access-enterprise-api-with-request-user 
Revert "Initialize enterprise api client with provided user"
 2017-09-20 11:04:10 -04:00
Sofiya Semenova
b40ba4437b Merge pull request #16042 from edx/ssemenova/ed-1233 
Replace flakey PreRequisiteCourseTest.test_dashboard_message with Python unit test
 2017-09-20 10:22:11 -04:00
Douglas Hall
610a4100af Revert "Initialize enterprise api client with provided user" 2017-09-20 09:55:02 -04:00
Sofiya Semenova
b6aff95ab1 Removed flakey test 2017-09-19 16:36:03 -04:00
Sofiya Semenova
19e7d1e0cf Ed-1233 replace flaky bokchoy test with python test 2017-09-19 16:12:40 -04:00
Alex Dusenbery
ab71318104 EDUCATOR-1316 | Refactor courseware.views.views._get_cert_data and related functions. 2017-09-19 11:11:37 -04:00
zubair-arbi
16120efaeb Initialize enterprise api client with provided user 
ENT-624
 2017-09-19 14:56:43 +05:00
Andy Armstrong
8fb993dcca Fix validation issues with Studio Sass files 2017-09-18 15:28:41 -04:00
tasawernawaz
6263a5743f Fix attribute error while reseting password 
LEARNER-388
 2017-09-14 22:55:29 +05:00
Michael LoTurco
5b349333c8 Merge pull request #15999 from edx/MLoTurco/learner-1993-alt 
Add Configuration to Enable Translated Web-Certificates
 2017-09-14 13:04:21 -04:00
ayub-khan
79b199bce9 Updated set_user_attribute method 2017-09-14 17:09:09 +05:00
Michael LoTurco
2399f0ab16 Added Fields to CertificateGenerationCourseSetting 2017-09-13 12:42:51 -04:00
Clinton Blackburn
14b8c12e88 Added Studio API endpoint to update course image 
LEARNER-2468
 2017-09-13 11:22:47 -04:00
Asad Iqbal
0066dee0ea Merge pull request #15984 from edx/asadiqbal08/ENT-604 
ENT-604 Updated the log level
 2017-09-12 18:15:21 +05:00
asadiqbal
a3a105cb2c ENT-604 Fix SAML Error on UI 2017-09-12 14:50:52 +05:00
M. Rehan
8c37dff1a8 Merge pull request #15475 from OmarIthawi/omar/default-english-transcripts 
Allow displaying videos without transcripts
 2017-09-12 12:22:41 +05:00
Omar Al-Ithawi
302e1d923e Allow displaying videos without transcripts 2017-09-11 21:29:58 +03:00
noraiz-anwar
1203eb5835 Do not override Default Video URL with value from VAL 2017-09-11 17:27:53 +05:00
Jeremy Bowman
ded294c420 pytest compatibility fixes 2017-09-06 14:20:34 -04:00
Jeremy Bowman
97f5fe035b Fixes for pytest database usage 2017-09-06 13:15:34 -04:00
Jeremy Bowman
6fb7d63c9e Fixes for test order dependence 2017-09-06 11:31:37 -04:00
Jeremy Bowman
ae44f1840c Merge pull request #15951 from edx/jmbowman/ddt_cleanup 
ddt usage cleanup
 2017-09-06 11:19:39 -04:00
Muzaffar yousaf
f1c574cf63 Merge pull request #15565 from jspayd/caption-centering 
Fix video caption centering
 2017-09-06 17:38:31 +05:00
Jeremy Bowman
fd6af6b05e ddt usage cleanup 2017-09-05 17:25:51 -04:00
Brittney Exline
ba597331d7 ENT-496 Set consent_granted to None when calling enterprise-course-enrollment endpoint 
Since we have a separate call to grant consent, we shouldn't try to set that value on
the enterprise course enrollment anymore, because it causes errors.
 2017-09-05 13:32:24 -04:00
Brian Mesick
1a77b98f6c Merge pull request #15904 from edx/bmedx/pdfjs_add_zh-hans 
Add zh_HANS language mapping to pdfjs
 2017-09-01 13:09:29 -04:00
bmedx
8aabd27081 Add zh_HANS language mapping to pdfjs and EDX_README 2017-09-01 10:56:35 -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
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
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
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
b77b06ecc2 Remove flaky bok choy test test_perform_problem_reset_and_navigate 2017-08-31 09:19:44 -04: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
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
Jeremy Bowman
fa623f3faf Merge pull request #15919 from edx/jmbowman/testcase_usage 
Clean up TestCase subclassing
 2017-08-30 10:16:07 -04: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
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