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

1216 Commits

Author SHA1 Message Date
George Song
7b34fe4ba6 Merge pull request #15009 from ahmedaljazzar/patch-1 
Added unicode to CourseUserGroup
 2017-05-02 13:18:57 -07:00
Calen Pennington
3deb3a3c1b Merge pull request #14977 from cpennington/cale/fix-learner-542 
Cale/fix learner 542
 2017-05-01 12:18:03 -04:00
Ahmed Jazzar
0da29d1786 Added unicode to CourseUserGroup 2017-05-01 13:14:20 +03:00
Calen Pennington
2ca367a147 Extract some common logic about dirty serializers into a helper method 2017-04-28 16:10:22 -04:00
Calen Pennington
0ca11f6428 Add a trailing comma to make future diffs cleaner 2017-04-28 15:40:46 -04:00
Calen Pennington
1c78d7c02e Remove a stray maxDiff = None 2017-04-28 15:17:05 -04:00
Ned Batchelder
ecce0f1513 Merge pull request #14996 from edx/nedbat/remove-useless-super-delegation 
Remove a number of unneeded super()-delegation methods
 2017-04-28 13:04:43 -04:00
Calen Pennington
1811f7235f Minimize the number of queries done while noop updating a user-preference 2017-04-28 12:26:41 -04:00
Calen Pennington
20caf52bea Use the existing user object in the case where a user is making changes to their own preferences 2017-04-28 12:26:39 -04:00
Christina Roberts
61316c3807 Merge pull request #14972 from edx/christina/ed11 
Renaming prep for allow discussions to be divided by enrollment tracks
 2017-04-28 11:00:09 -04:00
M. Rehan
ce93ad2af4 Merge pull request #14973 from edx/mrehan/educator-122-enable-course-sharing-in-future-courses 
EDUCATOR-112 – Enable sharing icons for future courses
 2017-04-28 18:33:53 +05:00
Qubad786
4b73bac9b2 Enable sharing icons for future courses 2017-04-28 15:45:24 +05:00
Qubad786
fad53592d2 Create or update course overview on a course publish event received from studio. 2017-04-28 14:31:45 +05:00
cahrens
31fbde9c1f Rename cohort methods to divided. 2017-04-27 14:58:08 -04:00
Ned Batchelder
4a568476fd Remove a number of unneeded super()-delegation methods 2017-04-27 14:12:56 -04:00
Ahsan Ulhaq
b6993c392d Stop program cert awarding if cert is not configured in credentials 
ECOM-4478
 2017-04-27 20:13:17 +05:00
Calen Pennington
33fee20c3a Reapply "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 65f13ddec4.
 2017-04-27 09:25:02 -04:00
edx-pipeline-bot
38c0fbd638 Merge pull request #14975 from edx/release-mergeback-to-master 
Merge release back to master
 2017-04-26 15:29:32 -04:00
Calen Pennington
65f13ddec4 Revert "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 88dd85caec, reversing
changes made to bf8aef33fc.
 2017-04-26 11:29:56 -04:00
Christina Roberts
8fbf01cd9b Merge pull request #14963 from edx/christina/ed15 
Don't return Credit as an EnrollmentTrack Group.
 2017-04-26 10:58:00 -04:00
Clinton Blackburn
2b4817b102 Added OpenID Connect discovery endpoint 
Although we are phasing out our support of OIDC, this particular feature will allow us to eliminate many of the settings we
share across services. Instead of reading various endpoints and secret keys from settings or hardcoded values, services
with the proper authentication backend can simply read (and cache) the information from this endpoint.

ECOM-3629
 2017-04-26 10:02:27 -04:00
Brittney Exline
2b48a5e7c5 Merge pull request #14920 from edx/bexline/registration_email 
ENT-304 Add confirm email field to registration
 2017-04-26 07:59:29 -04:00
Renzo Lucioni
a0129ccbb6 Merge pull request #14964 from edx/release-mergeback-to-master 
Merge release back to master
 2017-04-25 16:49:40 -04:00
cahrens
111b7dffd7 Don't return Credit as an EnrollmentTrack Group. 
EDUCATOR-15
 2017-04-25 15:40:22 -04:00
Brittney Exline
c2df64c3f8 ENT-304 Add confirm email field to registration 2017-04-25 18:35:29 +00:00
Calen Pennington
88dd85caec Merge pull request #14868 from cpennington/learner-542 
Store Learner language preferences into a cookie rather than the session
 2017-04-25 14:08:13 -04:00
Renzo Lucioni
ef606d6f0a Compress API results before caching them 
Some result sets may be larger than the default cache's 1 MB max item size. This change is a bandaid meant to allow us to resume use of memcached while we work on a longer-term fix.

LEARNER-682
 2017-04-25 12:52:28 -04:00
Calen Pennington
dffcb13c0e Validate that the language cookie is preserved during logout 2017-04-25 11:46:52 -04:00
Calen Pennington
f8b050a5d8 Put LANGUAGE_COOKIE into settings 2017-04-24 13:03:17 -04:00
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
Calen Pennington
4cc23bc641 Attempt to reduce the number of database calls for user_api serialization 2017-04-24 07:37:19 -04:00
Calen Pennington
0c82bae91c Add the caller to user_api caught error logging 2017-04-24 07:37:19 -04:00
Calen Pennington
e733179d49 Store Learner language preferences into a cookie rather than the session 
This modifies the lang-pref django app to:
a) Use the current value of the 'edx-language-preference' cookie to set the
   users Accept-Language header on an incoming request.
b) At the end of the request, update the 'edx-language-preference' cookie
   to reflect the users current Language Preference choice, if any.

[LEARNER-542]
 2017-04-24 07:37:19 -04: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
c13ac619c6 Treat no-id-professional enrollments as professional 
ECOM-7746
 2017-04-21 13:38:02 -04: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
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
Qubad786
b2cfad1650 Add Configuration Models for HLS Playback Feature. 2017-04-20 16:35:46 +05:00
Marko Jevtic
3d37635ffa [LEARNER-314] Determine client/learner eligibility 2017-04-20 05:53:13 +00: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
John Eskew
3aa061d4eb Add model migration files for crawlers/programs. 2017-04-19 15:15:54 -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
Albert St. Aubin
59c6218885 Show Enrollment Tracks in Group Configurations. 
TNL-6743
 2017-04-19 12:35:15 -04:00
Clinton Blackburn
be02fdb4ae Updated program credential back-population command to account for no-id-professional 
This command has been updated to treat professional and no-id-professional
enrollments in the same manner.

ECOM-7442
 2017-04-19 11:32:19 -04:00
Noraiz Anwar
a26560de84 Merge pull request #14891 from edx/noriaz/ECOM-7537 
ECOM-7537 Priortize advertised start date to diplay on learner's dashboard
 2017-04-17 11:46:34 +05:00
John Eskew
642c500d60 Fix Django 1.9 deprecation warnings by adding app_label. 2017-04-14 10:28:53 -04:00
noraiz-anwar
a7ceb880c8 Priortize advertised start date to diplay on learner's dashboard 2017-04-14 18:59:05 +05:00
Ahsan Ulhaq
da9d7b2e89 Merge pull request #14796 from edx/ahsan/ECOM-4776-Account-settings-page-load-and-create-user-profile 
Account settings page should load and create student user profile
 2017-04-14 14:43:09 +05:00
Clinton Blackburn
d6db981f68 Updated program progress to properly handled no-id-professional enrollments 
Enrollments with the no-id-professional mode are treated as professional
when determining program progress.

ECOM-7442
 2017-04-14 00:36:52 -04:00