Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3988 Commits

Author SHA1 Message Date
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
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
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
Ahsan Ulhaq
04ca94eaef Account settings page should load and create student user profile 
ECOM-4776
 2017-04-13 11:47:38 +05:00
Matthew Piatetsky
be5c4fad8b Merge pull request #14833 from edx/remainingnotification 
ECOM-7385 Add notification when a course is moved from in progress to remaining
 2017-04-12 17:57:01 -04:00
Matthew Piatetsky
7330ff99b6 Add notification to program detail view 
ECOM-7385
 2017-04-12 16:59:22 -04:00
Clinton Blackburn
579ce168a7 Removed switch display_retired_programs_on_learner_dashboard 
This functionality has been in production for a few days, and will not
be disabled. This switch can now be removed.

ECOM-7650
 2017-04-11 11:48:17 -04:00
Calen Pennington
5726265c19 Merge pull request #14849 from cpennington/learner-243 
Learner 243: Unauthenticated User Language Settings
 2017-04-11 09:28:18 -04:00
Calen Pennington
b2bf3ce60d fixup! Don't capture browser language into unauthenticated user session 2017-04-10 12:57:56 -04:00
Christina Roberts
5bcf7422d9 Merge pull request #14830 from edx/christina/change-default-cohorting 
Change default value for "always_cohort_inline_discussions" to False
 2017-04-10 10:04:55 -04:00
Calen Pennington
073e29cc03 Don't capture browser language into unauthenticated user session 
[LEARNER-243]
 2017-04-10 08:44:40 -04:00
cahrens
121078eb67 Change default value for "always cohort". 
TNL-6815
 2017-04-07 13:02:25 -04:00
Matthew Piatetsky
18ac075a21 Program Progress page redesign 
ECOM-7388
 2017-04-06 16:11:27 -04:00
Jeff LaJoie
413bce3d72 TNL-6739: adds in masquerading as enrollment track user 2017-04-06 09:35:08 -04:00
Renzo Lucioni
f00059f28c Collect data needed for program progress sidebar 
This includes a representation of the user's progress towards completing each course in the program and a list of any relevant course and/or program certificates the user has earned.

ECOM-7386
 2017-04-05 19:06:28 -04:00
Clinton Blackburn
bc45f82f5c Updated program filter for learner dashboard 
Learners will now see both active and retired programs on their
dashboards.

ECOM-7625
 2017-04-05 16:18:51 -04:00
Christina Roberts
15ab2b6be7 Merge pull request #14798 from edx/christina/tnl-6744 
Add Enrollment tracks to component visibility dialog
 2017-04-05 12:10:56 -04:00
cahrens
dbae1e397d Add ability to set visibility by enrollment track. 
TNL-6744
 2017-04-05 11:05:31 -04:00
Renzo Lucioni
72dd85cebf Modify program progress meter for use on detail pages 
The meter now supports use with a single program, and can return serialized courses instead of counts when measuring progress.

ECOM-6602
 2017-04-03 22:19:04 -04:00
Robert Raposa
ffe64add55 Add new relic custom metrics to course home. 
- Add new utilities to monitoring_utils djangoapp.
- Use new utilities for all new course tabs.
 2017-03-31 15:19:53 -04:00
Robert Raposa
77f111b2b1 Moves and rename common/djangoapps/newrelic_custom_metrics. 2017-03-31 15:19:53 -04:00
Ahsan Ulhaq
9e9c99ac0a Add eligible for financial aid and sync with course discovery 
ECOM-7532
 2017-03-31 14:35:56 +05:00