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

42657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
53d52964ba Merge pull request #15952 from edx/McKenzieW/learner-1994 
Added language field to certificate template
 2017-09-15 10:15:47 -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
Douglas Hall
04a61ff6a5 Merge pull request #15970 from open-craft/uman/enterprise-support-url 
[ENT-486] Add `ENTERPRISE_SUPPORT_URL` to environment config & version bump edx-enterprise to 0.44.0.
 2017-09-13 09:11:31 -04:00
Albert St. Aubin
9d0a1e80c7 Set formatting to show 2 decimal places on Program Purchase button 
[LEARNER-2291]
 2017-09-13 08:38:12 -04:00
Uman Shahzad
5fc4bad9ee Add ENTERPRISE_SUPPORT_URL to environment config and bump edx-enterprise to 0.44.0. 2017-09-13 07:42:09 -04:00
Andy Armstrong
393361e700 Merge pull request #15982 from edx/andya/sass-linting 
Lint Sass files using the rules in stylelint-config-edx
 2017-09-12 17:19:41 -04:00
Andy Armstrong
8de47f247c Address feedback 2017-09-12 15:35:46 -04:00
sanfordstudent
bdd4f23204 Merge pull request #15994 from edx/sstudent/fix_certs_tests 
fix cert test
 2017-09-12 15:15:40 -04:00
Awais Jibran
c2e10e562c Merge pull request #15997 from edx/aj/audit-course-with-course-info 
EDUCATOR-1333 - Auto-certs: Courses w/o certificates still display certificate issue date
 2017-09-13 00:05:42 +05:00
Sanford Student
0bd8b199e1 fix cert test 2017-09-12 14:12:25 -04:00
Awais Jibran
b4d4041fc9 Auto-certs: Courses w/o certificates still display certificate issue date to learners 2017-09-12 22:52:23 +05:00
Nimisha Asthagiri
67a246ad93 Merge pull request #15998 from edx/ret/update-schedule-date-change 
Update schedule start only if new course start date is in the future
 2017-09-12 11:26:43 -04:00
Brian Mesick
281c59daf8 Merge pull request #15958 from edx/bmedx/add_edx_lang_map_zh_hans 
Add language mapping for zh_CN to zh_HANS
 2017-09-12 10:19:41 -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
Gabe Mulley
58f0be290b Merge pull request #15990 from edx/ret/compact-footer 
Make the footer more visually compact
 2017-09-12 08:24:36 -04:00
Calen Pennington
6156fe929e Add tests of recurring nudge template rendering 2017-09-12 08:23:21 -04:00
Calen Pennington
cd4ebaf23c Only send one email even if there are multiple enrollments by the same user on the same day 2017-09-12 08:23:21 -04: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
Tasawer Nawaz
9330f14dfb Merge pull request #15983 from edx/tasawer/learner-2474/send-welcome-email-to-only-active-users 
send welcome email to only activated users
 2017-09-12 12:17:47 +05:00
tasawernawaz
9d7a1d5b53 send welcome email to only activated users 
LEARNER-2474
 2017-09-12 10:44:05 +05:00
Andy Armstrong
3bb6316620 Fix Sass quality issues in lms/static/sass/features 
Sass fixes
 2017-09-11 22:03:00 -04:00