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

15066 Commits

Author SHA1 Message Date
rabia23
ec105008b6 EDUCATOR-139 add log to identify the cause of error 2017-09-28 13:12:21 +00:00
Zubair Afzal
24df31402e Merge pull request #16067 from edx/zub/ENT-624-update-enterprise-api-support 
Ent 624 update enterprise api support
 2017-09-28 13:29:41 +05:00
Robert Raposa
643d7d2151 Merge pull request #16103 from edx/HarryRein/bok-choy-removal-flaky 
Remove Flaky StudentAdminTest test.
 2017-09-27 21:38:16 -04:00
zubair-arbi
4040c45f06 update enterprise api support for request users and enterprise service user 
ENT-624
 2017-09-27 18:04:44 +05:00
McKenzie Welter
190b2c36fe Changed lookup logic to consider language learner-1995 2017-09-27 07:53:39 -04:00
Uman Shahzad
f94558f464 Merge pull request #16094 from open-craft/uman/ent-0.48.1 
[WL-1240] [ENT-640] [ENT-628] [ENT-629] [ENT-630] [ENT-631] [ENT-634] [ENT-644] Bump to edx-enterprise to 0.48.1
 2017-09-27 00:16:34 +05:00
Harry Rein
6ba34f463a Remove Flaky StudentAdminTest test. 
EDUCATOR-552
 2017-09-26 13:42:29 -04:00
Robert Raposa
fb1d688670 Merge pull request #16091 from edx/robrap/LEARNER-2641 
LEARNER-2641: Add course goals bokchoy test.
 2017-09-26 11:30:49 -04:00
John Eskew
fe8f7f553d Merge pull request #16022 from edx/jeskew/toxify_edx_platform_testing 
Add tox testing to edx-platform.
 2017-09-26 11:14:11 -04:00
Diana Huang
d696677ce8 Merge pull request #15968 from edx/diana/header-updates 
LEARNER-2318: As a learner I should have an easy way to get to my learner profile
 2017-09-26 10:40:41 -04:00
Robert Raposa
407a43f827 Add course goals bokchoy test. 
LEARNER-2641
 2017-09-26 09:12:50 -04:00
Diana Huang
1cfefe2457 Modify the header to show the learner profile. 
Remove the profile from the user dropdown.

LEARNER-2318
 2017-09-25 17:06:08 -04:00
Nimisha Asthagiri
083ccdb95a Remove unneeded WRITE_ONLY_IF_ENGAGED waffle switch 2017-09-25 16:13:07 -04:00
Uman Shahzad
a27688afd0 Bump to edx-enterprise to 0.48.1 2017-09-26 00:43:09 +05:00
John Eskew
4de2ad4c25 Upgrade lxml to use pre-built pkg - no longer requires Cython. 2017-09-25 10:33:15 -04:00
John Eskew
550c1e0725 Use simpler contract spec to fix parsing error. 2017-09-25 10:33:14 -04:00
Brian Beggs
2d19136beb Merge pull request #16009 from edx/jmbowman/pytest_unit_tests 
PLAT-1677 Switch to pytest for unit tests
 2017-09-25 08:57:01 -04:00
Jeremy Bowman
ca97e946a6 Switch to pytest for unit tests 2017-09-22 16:07:53 -04:00
Nimisha Asthagiri
56676d821d Merge pull request #16077 from edx/naa/grades-refactor 
Grades: move out of temporary new folder
 2017-09-22 14:03:05 -04:00
Gabe Mulley
3088c70f25 only override the upgrade deadline in self-paced courses 2017-09-22 12:48:38 -04:00
Nimisha Asthagiri
22edaf7d24 Grades: move out of temporary new folder 
EDUCATOR-1400
 2017-09-22 11:49:46 -04:00
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