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

40930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
muhammad-ammar
7da2091aaf fix flaky js video test 
EDUCATOR-126
 2017-04-26 15:45:05 +05:00
M. Rehan
19961dc750 Merge pull request #14918 from edx/mrehan/course-sharing-utm-parameters 
Add utm parameters to course sharing url
 2017-04-26 13:00:56 +05:00
Attiya Ishaque
190a87d49d Merge pull request #14910 from edx/ai/TNL-4412-beta-tester-addition 
TNL-4412 user is not enrolled as a beta tester when account is unactivated.
 2017-04-26 12:03:47 +05:00
attiyaishaque
4316731f70 TNL-4412 user is not enrolled as a beta tester when account is unactivated. 2017-04-26 10:54:15 +05:00
Andy Armstrong
b06d5beddf Merge pull request #14953 from edx/andy/course-updates-page 
Implement new course updates page
 2017-04-25 18:44:06 -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
Andy Armstrong
6b8b79ff21 Implement new course updates page 
LEARNER-608
 2017-04-25 16:04:28 -04:00
Christina Roberts
3908512a0b Merge pull request #14786 from OmarIthawi/omar/reset-css-rtl 
RTL fixes for HTML xmodule and the LMS reset file
 2017-04-25 14:33:49 -04:00
Christina Roberts
91f2834f62 Merge pull request #14934 from edx/iivic/Update-xblock-utils-version 
Update version of xblock-utils in requirements
 2017-04-25 14:31:41 -04: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
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
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
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
Calen Pennington
dffcb13c0e Validate that the language cookie is preserved during logout 2017-04-25 11:46:52 -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
Qubad786
c28d7cd5f9 Add utm parameters to course sharing url 2017-04-24 23:01:21 +05: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
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
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
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
4d21fbe6b9 Use UserFactory.create so that it creates a UserProfile for the user 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