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
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
Nico van Niekerk
f2d51639ba FIX: course enrollment search, FIX: hidden tabs on instructor dashboard 2017-09-18 09:34:46 +02: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
Alex Dusenbery
d6604ebb02 EDUCATOR-1354 | Get cert display date a little more safely; include course when updating cert webview context. 2017-09-13 16:48:34 -04:00
Clinton Blackburn
f25674a606 Added pagination to Studio API course runs list endpoint 
The viewset class has also been updated to inherit from GenericViewSet to better take advantage of existing DRF code.

LEARNER-2468
 2017-09-13 16:39:05 -04:00
Uzair Rasheed
19b8723f38 Merge pull request #15980 from edx/LEARNER-748/Discussion-tab 
Fix inconsistency in the active tab colors
 2017-09-14 01:37:35 +05:00
John Eskew
ddb8dfc979 Merge pull request #15685 from edx/jeskew/upgrade_edx_oauth2_provider 
Bump versions of edx-django-oauth2-provider and edx-oauth2-provider
 2017-09-13 15:47:08 -04:00
uzairr
8b54c13fbc Fix inconsistency in the active tab colors 
The course header sass source is generating styles that eventually
are in conflict with some of the tabs.To avoid it, new style
properties are added that resolves it.

LEARNER-748
 2017-09-13 19:32:26 +00:00
Robert Raposa
e62aa716f3 Merge pull request #15991 from edx/robrap/LEARNER-2517-full-name-desc 
LEARNER-2517: Update full name help text.
 2017-09-13 15:29:19 -04:00
John Eskew
0eba0078e2 Bump versions of edx-django-oauth2-provider and edx-oauth2-provider 2017-09-13 13:07:59 -04: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
Clinton Blackburn
317f719d3c Added Studio API endpoint to re-run course runs 
LEARNER-2470
 2017-09-13 11:22:47 -04:00
Clinton Blackburn
256849950d Added Studio API endpoint to support course creation 
LEARNER-2468
 2017-09-13 11:22:47 -04:00
Albert (AJ) St. Aubin
f1b91cb871 Merge pull request #16007 from edx/aj/LEARNER-2291 
Set formatting to show 2 decimal places on Program Purchase button
 2017-09-13 10:34:24 -04:00