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

40882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clinton Blackburn
ff4d9e4360 Using shared secret for JWTs sent to Credentials API 
This change brings the Credentials API calls in line with those of other services. The change also makes it easier for the future switch to an asymmetric signing key.

LEARNER-629
 2017-04-24 12:28:23 -04:00
Clinton Blackburn
f4e72c80c5 Added given and family name fields to profile scope 
This information mirrors the fields returned in our ID token for OpenID
Connect (OIDC). Including this information will allow us to eventually
migrate toward replacing OIDC with OAuth 2.0 + JWT.

ECOM-3628
 2017-04-24 11:07:08 -04:00
Ivan Ivic
9dc3fd77bc Merge pull request #14943 from edx/iivic/LEARNER-605 
Enable all products to be displayed on receipt page
 2017-04-24 17:00:52 +02:00
AlasdairSwan
7689fee03f Merge pull request #14778 from edx/alasdair/ECOM-7386-program-progress-circle 
ECOM-7386 Added a program progress circle to program details page
 2017-04-24 10:10:52 -04:00
Saleem Latif
c9f9b72864 Merge pull request #14874 from edx/saleem-latif/ENT-306 
ENT-306: Change Account Activation UI on Dashboard
 2017-04-24 17:34:14 +05:00
Ivan Ivic
41cfbcfb55 Enable all products to be displayed on receipt page 
LEARNER-605
 2017-04-24 12:17:28 +00:00
Saleem Latif
0361b50286 Change Account Activation UI on Dashboard 2017-04-24 10:22:35 +05:00
Renzo Lucioni
70e13407a3 Fix course completion logic when determining program completion 
We want to treat professional certificates equally for the purposes of program completion.

LEARNER-601
 2017-04-21 17:35:24 -04:00
Matthew Piatetsky
4c3c13c234 Merge pull request #14938 from edx/ECOM-7746 
ECOM-7746 	Treat no-id-professional enrollments as professional
 2017-04-21 14:58:02 -04:00
AlasdairSwan
a466b437f6 ECOM-7386 Added a program progress circle to program details page 2017-04-21 14:45:55 -04:00
Matthew Piatetsky
c13ac619c6 Treat no-id-professional enrollments as professional 
ECOM-7746
 2017-04-21 13:38:02 -04:00
Cliff Dyer
579496a935 Merge pull request #14925 from edx/neem/backfill-command-waffle-override 
Allow specifying waffle switch on compute_grades
 2017-04-21 13:03:09 -04:00
Matthew Piatetsky
391ee40e2f Merge pull request #14937 from edx/fix_progress_issues 
Fix progress issues
 2017-04-21 12:40:06 -04:00
Matthew Piatetsky
ff0da0f78e Fix progress issues 
ECOM-6602
 2017-04-21 11:04:34 -04:00
Zubair Afzal
22ab0c8d47 Merge pull request #14907 from edx/zub/ENT-247-enterprise-logo-size-config 
ENT-247 Get enterprise logo image size limit from env configuration
 2017-04-21 19:46:09 +05:00
Asad Iqbal
7493c11ec2 Merge pull request #14890 from edx/asadiqbal08/ENT-188 
ENT-188 Enterprise Learner support requests from LMS to Zendesk queue
 2017-04-21 17:22:42 +05:00
asadiqbal
8cea65b2d7 ENT-188 2017-04-21 16:30:23 +05:00
Muhammad Ammar
c3d0a50d42 Merge pull request #14514 from edx/ammar/tnl-6513-frontend-hls-support 
HLS playback support in video player
 2017-04-21 12:38:11 +05:00
zubair-arbi
ff7de56a48 bump edx-enterprise version to 0.33.6 2017-04-21 12:37:30 +05:00
zubair-arbi
470a526d73 Get enterprise logo image size limit from env configuration 
ENT-247
 2017-04-21 12:35:28 +05:00
J. Cliff Dyer
7c3248f95c Allow specifying waffle switch on compute_grades 
If --estimate_first_attempted is passed, it can force enabling or
disabling the ENABLE_FIRST_ATTEMPTED waffle switch.

TNL-6841
 2017-04-20 15:18:09 -04:00
Clinton Blackburn
163c71e8c4 Updated CREDENTIALS_SERVICE_USERNAME setting for Docker-based devstack 2017-04-20 14:57:22 -04:00
Jeremy Bowman
adecfaec74 Merge pull request #14930 from edx/jmbowman/PLAT-1200 
PLAT-1200 Upgrade to bok-choy 0.7.0 take 2
 2017-04-20 14:53:58 -04:00
M. Rehan
ccf6c23dc0 Merge pull request #14924 from edx/mrehan/add-hls-feature-flag 
Add Configuration Models for HLS Playback Feature.
 2017-04-20 20:54:02 +05:00
Jeremy Bowman
f2f9874f73 Upgrade to bok-choy 0.7.0 2017-04-20 11:25:59 -04:00
Adam
64372dd53e Merge pull request #13038 from OmarIthawi/edraak/bulk-email-from-addr 
Translatable bulk_email from Address based on platform`s default lang
 2017-04-20 10:29:59 -04:00
Noraiz Anwar
c1b148dd74 Merge pull request #14916 from edx/noraiz/TNL-6837 
TNL-6837 ORAs and Drag and Drop not supported in libraries, remove both from problem types in studio
 2017-04-20 19:20:55 +05:00
AlasdairSwan
7f09919cf6 Merge pull request #14926 from edx/alasdair/LEARNER-602-program-card-tet-update 
LEARNER-602 Updated program card text for states
 2017-04-20 10:03:05 -04:00
Ivan Ivic
9ef91591fc Merge pull request #14906 from edx/iivic/LEARNER-381 
Update Order History page to reflect bundled purchase
 2017-04-20 15:47:05 +02:00
sanfordstudent
205f0723bc Merge pull request #14922 from edx/sstudent/grade_reports 
additional logging for grade reports investigation
 2017-04-20 09:37:04 -04:00
John Eskew
1791d141a7 Merge pull request #14894 from edx/jeskew/fix_more_django_19_warnings 
Fix Django 1.9 deprecation warnings by adding app_label.
 2017-04-20 09:29:44 -04:00
noraiz-anwar
074900632a ORAs and Drag and Drop not supported in libraries, remove both from problem types in studio 2017-04-20 18:27:13 +05:00
Matt Drayer
561646699c Merge pull request #14762 from edx/mattdrayer/add-enterprise-aws-config 
Add environment overrides for Enterprise settings
 2017-04-20 09:12:05 -04:00
AlasdairSwan
3c1f61c9db LEARNER-602 Updated program card text for states 2017-04-20 09:05:59 -04:00
Ivan Ivic
b682c43d48 Update Order History page to reflect bundled purchase 
LEARNER-381
 2017-04-20 12:24:34 +00:00
Qubad786
b2cfad1650 Add Configuration Models for HLS Playback Feature. 2017-04-20 16:35:46 +05:00
Ahsan Ulhaq
1a31f251f8 Merge pull request #14875 from edx/ahsan/ECOM-7688-users-seeing-500-error-Financial-assistance-application 
Financial aid for courses with no course overview
 2017-04-20 16:30:38 +05:00
Ahsan Ulhaq
650695845e Financial aid for courses with no course overview 
ECOM-7688
 2017-04-20 13:55:22 +05:00
Marko Jevtić
d9f17435ae Merge pull request #14909 from edx/mjevtic/LEARNER-314 
[LEARNER-314] Determine client/learner eligibility
 2017-04-20 09:00:51 +02:00
Marko Jevtic
3d37635ffa [LEARNER-314] Determine client/learner eligibility 2017-04-20 05:53:13 +00:00
Eric Fischer
7e368e10f7 Merge pull request #14913 from edx/efischer/rekill 
Re-kill ICRV block
 2017-04-19 16:48:33 -04:00
edx-pipeline-bot
602b737b87 Merge pull request #14923 from edx/release-mergeback-to-master 
Merge release back to master
 2017-04-19 16:41:15 -04:00
Eric Fischer
5c26acc115 Re-kill ICRV block 
This reverts commit 1224e341de. I've also added
NotImplementedPartitionScheme, which allows deprecated partition types to have
a valid entry point despite being unusable.

TNL-6675
 2017-04-19 15:55:13 -04:00
Christina Roberts
7e99daacbc Merge pull request #14921 from edx/christina/choose-one 
Change "Choose one" to "Select a group type".
 2017-04-19 15:48:09 -04:00
Sanford Student
edee55d3f2 additional logging 2017-04-19 15:29:23 -04:00
John Eskew
3aa061d4eb Add model migration files for crawlers/programs. 2017-04-19 15:15:54 -04:00
cahrens
5e14a35607 Change "Choose one" to "Select a group type". 2017-04-19 14:32:44 -04:00
sanfordstudent
bd2025d60d Merge pull request #14912 from edx/sstudent/TNL-6833 
use higher of two available grades
 2017-04-19 14:27:51 -04:00
Christina Roberts
5599a4513d Merge pull request #14803 from edx/aj/TNL-6743_GroupConfigEnrollmentPartition 
Aj/tnl 6743 group config enrollment partition
 2017-04-19 14:27:06 -04:00
Jesse Shapiro
3f05d2e64d Merge pull request #14900 from open-craft/haikuginger/sso-provider-session-expiry 
[ENT-327] Allow per-SSO-provider session expiration limits
 2017-04-19 13:52:41 -04:00