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

16050 Commits

Author SHA1 Message Date
Christina Roberts
61316c3807 Merge pull request #14972 from edx/christina/ed11 
Renaming prep for allow discussions to be divided by enrollment tracks
 2017-04-28 11:00:09 -04:00
Qubad786
4b73bac9b2 Enable sharing icons for future courses 2017-04-28 15:45:24 +05:00
Diana Huang
7a0d52bb00 Merge pull request #15000 from edx/diana/fix-url-name 
Use correct url helper.
 2017-04-27 16:40:04 -04:00
Nimisha Asthagiri
9e71538d33 Merge pull request #14984 from edx/neem/refactor-instructor-grades 
Refactor Grade Report in prep for parallelization
 2017-04-27 16:22:42 -04:00
Diana Huang
b10c7dfc74 Use correct url helper. 2017-04-27 15:36:34 -04:00
Matthew Piatetsky
a46453fc6a Merge pull request #14995 from edx/minor_tweaks 
ECOM-6602 Minor program progress fixes
 2017-04-27 15:22:53 -04:00
cahrens
31fbde9c1f Rename cohort methods to divided. 2017-04-27 14:58:08 -04:00
Matthew Piatetsky
fb0e9b7574 Minor program progress fixes 
ECOM-6602
 2017-04-27 14:02:32 -04:00
Matthew Piatetsky
ee98a525ee Merge pull request #14993 from edx/fix-karma-test 
Fix karma test
 2017-04-27 14:01:26 -04:00
Douglas Hall
1f8125df40 Merge pull request #14987 from edx/douglashall/add_certificates_model_admin 
Add the CertificateGenerationCourseSetting model to Django admin.
 2017-04-27 12:47:05 -04:00
Uzair Rasheed
c1e63cb086 Merge pull request #14935 from edx/uzairr/ECOM-7252-refund 
ECOM-7252-fix refund discrepancy after the course mode expiry
 2017-04-27 20:58:21 +05:00
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
Nimisha Asthagiri
379a2c181b Refactor Grade Report in prep for parallelization. 2017-04-27 08:33:01 -04:00
Ned Batchelder
44dd7be5b6 Update translations (autogenerated message) 2017-04-27 12:16:29 +00:00
Douglas Hall
690727580b Add the CertificateGenerationCourseSetting model to Django admin. 
WL-1041
 2017-04-27 06:16:55 -04: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
uzairr
d5064413c1 fix of refund after course mode expiry 2017-04-26 18:29:59 +00: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