Commit Graph

42689 Commits

Author SHA1 Message Date
Brian Mesick
bf47ba855f Merge pull request #16014 from edx/bmedx/upgrade_django_openid_auth
Upgrade edx-django-openid-auth
2017-09-20 09:56:19 -04:00
Awais Jibran
3e06d68112 Merge pull request #16025 from edx/aj/handle-rate-limit-s3
BOTO:S3 handle rate limit exceed and do not expose 500 errors
2017-09-20 18:47:50 +05:00
Noraiz Anwar
c25925c0e4 Merge pull request #16055 from edx/noraiz/EDUCATOR-1218
upgrade lti-consumer xblock
2017-09-20 16:04:32 +05:00
noraiz-anwar
6f5a4d54c2 upgrade lti-consumer xblock 2017-09-20 14:43:05 +05:00
Alex Dusenbery
42829bd272 EDUCATOR-1103 | Restrict the number of courses to run a single opt-in query for. 2017-09-19 15:27:54 -04:00
Ned Batchelder
7a87509660 Merge pull request #16050 from edx/nedbat/fix-early-translation
Have to use ugettext_lazy for import-time translations
2017-09-19 15:17:02 -04:00
Matt Tuchfarber
9a2d2931a8 Merge pull request #16049 from edx/tuchfarber/update_enterprise_version
Bump edx-enterprise version
2017-09-19 15:00:19 -04:00
Ned Batchelder
253c6fba24 Have to use ugettext_lazy for import-time translations 2017-09-19 14:11:05 -04:00
Matt Tuchfarber
b55525eb76 Bump edx-enterprise version 2017-09-19 14:04:31 -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 Afzal
fd07dea0e8 Merge pull request #16001 from edx/zub/ENT-624-access-enterprise-api-with-request-user
Initialize enterprise api client with provided user
2017-09-19 18:14:06 +05:00
zubair-arbi
16120efaeb Initialize enterprise api client with provided user
ENT-624
2017-09-19 14:56:43 +05:00
Sofiya Semenova
d62e249834 Merge pull request #15996 from edx/ssemenova/ed-1319
ED-1319 Cert not accessible by learner
2017-09-18 13:09:36 -04:00
Alex Dusenbery
84c8fa3072 EDUCATOR-1371 | Turn off excessive SubsectionGradeFactory logging. 2017-09-18 12:13:48 -04:00
Sofiya Semenova
3b34db29ff ED-1319 Cert not accessible by learner 2017-09-18 12:09:28 -04:00
Douglas Hall
64e1b201e6 Merge pull request #16037 from edx/douglashall/ENT=640
Upgrade edx-enterprise to version 0.46.1.
2017-09-18 11:25:26 -04:00
Douglas Hall
3828f31c74 Upgrade edx-enterprise to version 0.46.1.
https://github.com/edx/edx-enterprise/compare/0.46.0...0.46.1
2017-09-18 10:04:45 -04:00
Tasawer Nawaz
89656d08fc Merge pull request #16036 from edx/tasawer/learner-2555-change-django-admin-titles-in-cms-and-lms
Change django admin titles in CMS and LMS
2017-09-18 18:19:53 +05:00
Nimisha Asthagiri
3d15bdca58 Merge pull request #16028 from edx/ret/log-level-per-message
Schedules/ACE - support debug logging via waffle
2017-09-18 08:51:56 -04:00
Tasawer Nawaz
ef5e656094 Merge pull request #16034 from edx/tasawer/learner-2450/translate-validation-message
fix untranslated validation message on course grader
2017-09-18 17:42:23 +05:00
tasawernawaz
8218d8265d change django admin titles in CMS and LMS
LEARNER-2555
2017-09-18 17:21:41 +05:00
Awais Jibran
79915b3704 BOTO:S3 handle rate limit exceed and do not expose 500 errors 2017-09-18 15:34:06 +05:00
tasawernawaz
510dcd14ed fix untranslated validation message on course grader LEARNER-2450 2017-09-18 14:51:53 +05:00
Nimisha Asthagiri
813007bb49 Schedules/ACE - support debug logging via waffle 2017-09-16 22:03:28 -04:00
Awais Jibran
468fd9991c Merge pull request #16029 from edx/aj/up-proctoring-to-1.2.1
Upgrade proctoring to 1.2.1
2017-09-16 12:58:55 +05:00
Douglas Hall
be68ae21e6 Merge pull request #16031 from edx/douglashall/ENT-610
ENT-610 Convert CourseKey to string before passing to data sharing consent check function.
2017-09-15 19:21:37 -04:00
Bill Filler
5b1c3f4906 Merge pull request #16033 from edx/bfiller/WL-1221
Upgrade edx-enterprise to 0.46.0
2017-09-15 17:05:40 -04:00
Bill Filler
efa0ef4ae8 Upgrade edx-enterprise to 0.46.0 2017-09-15 16:33:16 -04:00
Douglas Hall
cafef98aa4 ENT-610 Convert CourseKey to string before passing to data sharing consent check function. 2017-09-15 15:58:39 -04:00
McKenzie Welter
bbe18f0dc5 Merge pull request #16011 from edx/McKenzieW/learner-2457
Added util method to retrieve individual course_run data from Catalog
2017-09-15 15:57:19 -04:00
Awais Jibran
ee6899592a Upgrade proctoring to 1.2.1 2017-09-16 00:23:06 +05:00
McKenzie Welter
531a51f75c Added util method to retrieve individual course_run data from Catalog 2017-09-15 15:03:20 -04:00
McKenzie Welter
53d52964ba Merge pull request #15952 from edx/McKenzieW/learner-1994
Added language field to certificate template
2017-09-15 10:15:47 -04:00
bmedx
f2ad2601f7 Upgrade edx-django-openid-auth to 0.14 2017-09-15 09:18:44 -04:00
McKenzie Welter
288ae94857 Added language field to certificate template 2017-09-15 08:51:09 -04:00
Douglas Hall
51beb277d1 Merge pull request #16024 from edx/douglashall/ENT-638
Upgrade edx-enterprise to 0.45.0.
2017-09-15 05:31:42 -04:00
Tasawer Nawaz
a904324f6d Merge pull request #16021 from edx/tasawer/learner-388-fix-attribute-error-in-password-reseting
Fix attribute error while reseting password
2017-09-15 11:12:37 +05:00
Kevin Falcone
3b680cb8c5 Merge pull request #16023 from edx/jibsheet/bump-pygments
pygments < 2.1 had a shell injection attack
2017-09-14 15:59:08 -04:00
Ned Batchelder
63d78e3c41 Merge pull request #16020 from edx/nedbat/update-translations
Update translations (autogenerated message)
2017-09-14 14:49:37 -04:00
Douglas Hall
c243fb52f3 Upgraded edx-enterprise to 0.45.0.
ENT-638
2017-09-14 14:35:45 -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
Kevin Falcone
ef13c0cb4f pygments < 2.1 had a shell injection attack
We only really use it in tests, but if tests still pass this should
be an easy upgrade.
2017-09-14 12:49:36 -04:00
Simon Chen
dd0ea544db Merge pull request #16018 from edx/clintonb/studio-api-partial-update
Fixed bug for partial updates for Studio API course runs endpoint
2017-09-14 12:44:59 -04:00
sanfordstudent
386b1fc21b Merge pull request #16013 from edx/sstudent/universal_waffle_switch
Use unified waffle switch
2017-09-14 11:44:52 -04:00
Sanford Student
e4735a6aba switch over to unified waffle switch
for EDUCATOR-1313
2017-09-14 09:58:39 -04:00
Ayub khan
8f7fbbf094 Merge pull request #16004 from edx/LEARNER-2165
Updated set_user_attribute method
2017-09-14 18:12:12 +05:00
ayub-khan
79b199bce9 Updated set_user_attribute method 2017-09-14 17:09:09 +05:00
Ned Batchelder
5c21261aa3 Update translations (autogenerated message) 2017-09-14 11:42:32 +00:00
Clinton Blackburn
4b9f017d4a Fixed bug for partial updates for Studio API course runs endpoint
Existing data remains intact when performing a partial update.

LEARNER-2468
2017-09-13 18:05:21 -04:00