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

16036 Commits

Author SHA1 Message Date
Matthew Piatetsky
ada78f5d3b Fix failing karma test 
ECOM-6602
 2017-04-27 11:31:51 -04:00
Matthew Piatetsky
79a40eb340 Merge pull request #14974 from edx/fix_progress_css_bug 
Fix progress css bug
 2017-04-27 10:49:53 -04:00
Ned Batchelder
44dd7be5b6 Update translations (autogenerated message) 2017-04-27 12:16:29 +00:00
Saleem Latif
76467a02d6 Merge pull request #14969 from edx/saleem-latif/ENT-306-a11y 
ENT-306: a11y feedback changes for account activation message
 2017-04-27 12:19:29 +05: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
Matthew Piatetsky
932a23fbc7 Fix css bug with notification 
ECOM-6602
 2017-04-26 13:32:08 -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
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
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
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
20c4a758ab a11y feedback changes for account activation message 2017-04-26 12:27: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
6b8b79ff21 Implement new course updates page 
LEARNER-608
 2017-04-25 16:04:28 -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
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
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
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
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
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
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
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
Ivan Ivic
41cfbcfb55 Enable all products to be displayed on receipt page 
LEARNER-605
 2017-04-24 12:17:28 +00: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
Saleem Latif
0361b50286 Change Account Activation UI on Dashboard 2017-04-24 10:22:35 +05:00
AlasdairSwan
a466b437f6 ECOM-7386 Added a program progress circle to program details page 2017-04-21 14:45:55 -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
ff0da0f78e Fix progress issues 
ECOM-6602
 2017-04-21 11:04:34 -04:00