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

40909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
bf8aef33fc Merge pull request #14945 from edx/diana/correct-course-redirects 
Course jump tos should go to the main course home page.
 2017-04-25 13:40:31 -04:00
Jesse Zoldak
b90d53bbab Merge pull request #14957 from edx/zoldak/LEARNER-689 
Mark test as flaky  LEARNER-689
 2017-04-25 12:38:04 -04:00
Diana Huang
c14f0b14ea Course jump tos should go to the main course home page. 2017-04-25 11:33:14 -04:00
Nimisha Asthagiri
6ee7f409f2 Merge pull request #14952 from edx/neem/refactor-grade-report 
Refactor Instructor Tasks - in prep for Grade report work
 2017-04-25 11:18:37 -04:00
Jesse Zoldak
e3d2259be4 Mark test as flaky LEARNER-689 2017-04-25 10:40:50 -04:00
Jesse Zoldak
37fbf17360 Revert "Mark test as flaky LEARNER-689" 
This reverts commit ecc50f6f05.
 2017-04-25 10:39:53 -04:00
Jesse Zoldak
ecc50f6f05 Mark test as flaky LEARNER-689 2017-04-25 10:38:47 -04:00
Nimisha Asthagiri
6cdfeb98cb Merge pull request #14946 from edx/neem/refactor_grades_misc 
Grades API misc cleanup
 2017-04-25 10:14:25 -04:00
Rabia Iftikhar
1b6778f694 Merge pull request #14932 from edx/ri/TNL-6666-500-error-courseware 
update log info
 2017-04-25 17:05:22 +05:00
Michael Frey
77a347c1ab Merge pull request #14950 from edx/mjfrey/LEARNER-616 
Only use ecommerce hosted receipt page
 2017-04-25 07:23:31 -04:00
Nimisha Asthagiri
18433dab95 Refactor Instructor Tasks - in prep for Grade report work 2017-04-24 19:35:06 -04:00
Michael Frey
c8b5dc06da Only use ecommerce hosted receipt page 
LEANER-616
 2017-04-24 19:25:21 -04:00
Andy Armstrong
b3a9689dc3 Merge pull request #14949 from edx/andya/course-sidebar 
Add a sidebar to the new course home page
 2017-04-24 19:17:24 -04:00
Clinton Blackburn
8e1b9e1733 Added support for disabling removal of old Python libraries 
The NO_PYTHON_UNINSTALL environment variable can now be used to disable the task that removes older versions of Python libraries. This task is not necessary for Docker images/containers since we always create a fresh virtualenv when we create the image.
 2017-04-24 18:06:46 -04:00
Nimisha Asthagiri
16114f585b Miscellaneous grades code cleanup - pending from previous PRs 2017-04-24 17:58:18 -04:00
Andy Armstrong
25229a741b Implement course handouts 
LEARNER-607
 2017-04-24 17:47:47 -04:00
Michael Frey
85d05558c5 Merge pull request #14948 from edx/revert-14939-mjfrey/LEARNER-616 
Revert "Only use ecommerce hosted receipt page"
 2017-04-24 15:28:55 -04:00
Ben Patterson
73833e4164 Merge pull request #14861 from edx/benp/refactor-a11y-test-script 
Simplify a11y test script (so the crawler always runs).
 2017-04-24 15:08:56 -04:00
Andy Armstrong
e7e7b3bc15 Add a sidebar to the new course home page 
LEARNER-606
 2017-04-24 14:52:42 -04:00
Michael Frey
b2dcc9c49b Revert "Only use ecommerce hosted receipt page" 2017-04-24 14:39:07 -04:00
rabia23
186e820b3d update log when there's an IndexError on loading courseware 
raise IndexError after catching it
 2017-04-24 14:31:58 -04:00
Nimisha Asthagiri
96f2253036 Merge pull request #14870 from edx/neem/rename_scores 
Rename location_to_scores -> problem_scores
 2017-04-24 13:50:54 -04:00
Michael Frey
ba1dfa1346 Merge pull request #14939 from edx/mjfrey/LEARNER-616 
Only use ecommerce hosted receipt page
 2017-04-24 13:30:08 -04:00
Ben Patterson
220925aac7 Merge branch 'master' into benp/refactor-a11y-test-script 2017-04-24 13:10:00 -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
Nimisha Asthagiri
61c0a01b37 Rename location_to_scores -> problem_scores 2017-04-24 11:01:30 -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
Michael Frey
9ac4cef972 Only use ecommerce hosted receipt page 
LEARNER-616
 2017-04-24 10:46:48 -04: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