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

40950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Armstrong
cc98111ddb Merge pull request #14980 from edx/andya/unified-course-title 
Update unified course home page's title
 2017-04-26 17:53:17 -04:00
Cliff Dyer
da13a7db1b Merge pull request #14982 from edx/neem/batch-size-error 
Fix batch size error and kwargification of compute_v2.
 2017-04-26 17:16:42 -04:00
Andy Armstrong
3e15661d00 Update unified course home page's title 
LEARNER-694
 2017-04-26 17:02:04 -04:00
J. Cliff Dyer
77f5e2dd00 Fix batch size error and kwargification of compute_v2. 2017-04-26 16:30:27 -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
Muhammad Ammar
3469cfc441 Merge pull request #14970 from edx/ammar/educator-126-fix-js-flaky 
fix flaky js video test
 2017-04-27 00:05:56 +05:00
Andy Armstrong
1ab0825f2e Merge pull request #14967 from edx/andya/empty-course-message 
Add an empty course message to the course home page
 2017-04-26 14:50:15 -04:00
Andy Armstrong
8c93eac6a3 Add an empty course message to the course home page 
LEARNER-27
 2017-04-26 13:16:36 -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
Cliff Dyer
20447bd8ad Merge pull request #14965 from edx/neem/routing-key 
Fix calling convention for celery options
 2017-04-26 10:54:07 -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
J. Cliff Dyer
8e409800fe Fix calling convention for celery options 2017-04-26 09:35:15 -04:00
Albert (AJ) St. Aubin
0df079a9c6 Merge pull request #13026 from OmarIthawi/edraak/goup-config-rtl 
Major RTL refactor for the group configuration in Studio
 2017-04-26 09:19:31 -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
Saleem Latif
c626f1f79a Merge pull request #14968 from edx/saleem-latif/saleem-latif-enterprise-33-8 
edx-enterprise version upgrade to 0.33.9
 2017-04-26 16:47:01 +05:00
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
Saleem Latif
f4b1554c72 edx-enterprise version upgrade to 0.33.9 2017-04-26 12:12:25 +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
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
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