Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,133 Commits 1 Branch 0 Tags
61c0ec7f4266700a720d262df7e5479704aadf1c
Commit Graph

41133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
61c0ec7f42 Merge pull request #15096 from edx/diana/masquerade-issues 
Fix test to use the start instead of due date.
 2017-05-11 17:12:00 -04:00
Diana Huang
ef5c23c59c Fix test to use the start instead of due date. 2017-05-11 14:16:26 -04:00
Alex Dusenbery
caf7c8912a Merge pull request #15046 from edx/aed/TNL-6832 
TNL-6832 | Grade reports should include unenrolled learners
 2017-05-11 13:14:02 -04:00
Alex Dusenbery
b33a9436d6 TNL-6832 | Include inactive enrollees in course and problem grade reports. 2017-05-11 13:10:38 -04:00
sanfordstudent
fd5eef3812 Merge pull request #15026 from edx/neem/TNL-6637 
treat empty string as None for letter grades
 2017-05-11 10:45:17 -04:00
Sanford Student
42fe9bd9b3 treat empty string as None for letter grades 2017-05-11 10:00:19 -04:00
Attiya Ishaque
0e3e90f806 Merge pull request #15057 from edx/ai/EDUCATOR-283 
EDUCATOR-283 Old mathjax not load in preview box.
 2017-05-11 15:59:53 +05:00
attiyaishaque
9188dbdb47 EDUCATOR-283 Old mathjax not load in preview box. 2017-05-11 15:02:17 +05:00
Nimisha Asthagiri
424d3b40bf Merge pull request #15089 from edx/neem/redo_bulk_grades 
Redo Bulk-reads and Request caching in Course Grade Reports
 2017-05-10 18:12:19 -04:00
Andy Armstrong
482f76527e Merge pull request #15064 from edx/andya/welcome-message 
Show a welcome message on the course home page
 2017-05-10 17:40:25 -04:00
Nimisha Asthagiri
4430695b1c Fix column alignment issue when Teams is disabled 
This reverts commit b6b704019f.
 2017-05-10 17:14:45 -04:00
Nimisha Asthagiri
adb88e21f3 Bulk-reads and Request caching in Course Grade Report 
This reverts commit 5388d5d1fc.
 2017-05-10 17:14:29 -04:00
Andy Armstrong
64de44321b Show a welcome message on the course home page 
LEARNER-879
 2017-05-10 16:53:15 -04:00
edx-pipeline-bot
544d5d5996 Merge pull request #15085 from edx/release-mergeback-to-master 
Merge release back to master
 2017-05-10 15:19:09 -04:00
Robert Raposa
10fd02f946 Merge pull request #15074 from edx/robrap/LEARNER-922 
LEARNER-922: Fix logic error in calculating last accessed.
 2017-05-10 14:54:15 -04:00
Douglas Hall
6c36980c2b Merge pull request #15086 from edx/douglashall/fix_activation_email_from_address 
Allow override of initial account activation from address.
 2017-05-10 14:41:27 -04:00
Robert Raposa
8569cb3587 Fix logic error in calculating last accessed. 2017-05-10 13:48:22 -04:00
Douglas Hall
665ec6c475 Allow override of initial account activation from address. 
In PR #15030, we missed adding the override of the initial account activation from address using the ACTIVATION_EMAIL_FROM_ADDRESS SiteConfiguration setting. We had only added the override when a subsequent activation email was sent.

ENT-318
 2017-05-10 13:44:19 -04:00
sanfordstudent
9bedb066cc Merge pull request #15084 from edx/neem/grade_report_revert 
Revert "Fix column alignment issue when Teams is disabled"
 2017-05-10 13:36:34 -04:00
Attiya Ishaque
1bbde0073c Merge pull request #15083 from edx/ai/EDUCATOR-293-remove-flaky 
EDUCATOR-293 Remove flaky decorator from test_proctored_exam_flow.
 2017-05-10 22:33:43 +05:00
attiyaishaque
377283a353 EDUCATOR-293 Remove flaky decorator from test_proctored_exam_flow. 2017-05-10 21:32:18 +05:00
Sanford Student
b6b704019f Revert "Fix column alignment issue when Teams is disabled" 
This reverts commit e97283ae44.
 2017-05-10 12:10:48 -04:00
Carol Tong
f3153651d2 Merge pull request #15072 from edx/carol/DOC-3411Help 
DOC-3411 Update lms_config.ini: instructor dashboard Help landing page
 2017-05-10 11:45:22 -04:00
Diana Huang
208cffd64d Merge pull request #15075 from edx/diana/reverse-back-arrow-rtl 
Swap direction of arrow for RTL.
 2017-05-10 11:07:00 -04:00
Carol Tong
9442a2629c DOC-3411 Update lms_config.ini for instr dash landing page 2017-05-10 10:58:41 -04:00
Nimisha Asthagiri
956207b932 Merge pull request #15081 from edx/neem/bulk-read-grade-report 
Grade Report: Fix column alignment issue when Teams is disabled
 2017-05-10 10:19:52 -04:00
Douglas Hall
ec45278b05 Merge pull request #15073 from edx/douglashall/activation_email_followup 
Remove edx.org theme override of activation email body.
 2017-05-09 20:58:58 -04:00
Nimisha Asthagiri
e97283ae44 Fix column alignment issue when Teams is disabled 2017-05-09 19:44:34 -04:00
Renzo Lucioni
750d448799 Avoid passing a generator expression to cache.get_many() 
Generator expressions passed to the memcached backend's implementation of get_many() are exhausted prematurely. This results in KeyErrors when the backend tries to map keys returned by memcached back to keys passed by application code.

See https://github.com/django/django/blob/stable/1.8.x/django/core/cache/backends/memcached.py/#L99.

LEARNER-382
 2017-05-09 18:24:39 -04:00
Matthew Piatetsky
5cf828a728 Merge pull request #15077 from edx/LEARNER-886 
LEARNER-886 Fix check for image url on program detail page
 2017-05-09 17:31:57 -04:00
sanfordstudent
40e9e20af9 Merge pull request #15078 from edx/sstudent/revert_grade_reports 
Sstudent/revert grade reports
 2017-05-09 17:08:57 -04:00
Sanford Student
5388d5d1fc Revert "Bulk-reads and Request caching in Course Grade Report" 
This reverts commit 16e9636513.
 2017-05-09 16:25:46 -04:00
Matthew Piatetsky
21c24eb99e Fix check for image url on program detail page 
LEARNER-886
 2017-05-09 16:02:56 -04:00
Douglas Hall
0a313da601 Remove edx.org theme override of activation email body. 
We have standardized the activation email in the base activation email body template, so we do not need this override any longer.

ENT-318
 2017-05-09 15:46:10 -04:00
Matt Drayer
524e2f3e24 Merge pull request #15071 from edx/mattdrayer/edx-enterprise-0.33.13 
mattdrayer/edx-enterprise-0.33.13: Update package reference
 2017-05-09 15:26:25 -04:00
Diana Huang
9cd819808d Swap direction of arrow for RTL. 2017-05-09 14:40:34 -04:00
Robert Raposa
698475f5d3 Merge pull request #15070 from edx/robrap/revert-waffle-hack 
Revert: Default unified_course_view on in devstack.
 2017-05-09 14:23:18 -04:00
Muzaffar yousaf
5673cee9c7 Merge pull request #15068 from edx/mrehan/bump-course-overview 
bump up the courseoverview version
 2017-05-09 23:01:42 +05:00
Matt Drayer
534590143d mattdrayer/edx-enterprise-0.33.13: Update package reference 2017-05-09 11:22:18 -04:00
Nimisha Asthagiri
3491837e9c Merge pull request #15036 from edx/neem/bulk-read-grade-report 
Bulk-reads and Request caching in Course Grade Report
 2017-05-09 10:53:01 -04:00
Nimisha Asthagiri
9df23dc23e Merge pull request #15066 from edx/neem/fix-block-structure-key-error 
Fix KeyError issue with empty course structures
 2017-05-09 10:39:53 -04:00
Robert Raposa
59522311ef Revert: Default unified_course_view on in devstack. 2017-05-09 10:08:58 -04:00
Matt Drayer
cd56cc56cd Merge pull request #15030 from edx/mattdrayer/ENT-318 
ENT-318: Update activation email subject and message text
 2017-05-09 09:29:13 -04:00
Qubad786
446fa65bcd bump up the courseoverview version 2017-05-09 18:02:36 +05:00
Nimisha Asthagiri
16e9636513 Bulk-reads and Request caching in Course Grade Report 2017-05-09 08:58:49 -04:00
Nimisha Asthagiri
8c01ffb71a Fix KeyError issue with empty course structures. 
EDUCATOR-340
 2017-05-09 08:44:09 -04:00
Renzo Lucioni
3aba9da8fa Support reading of programs exclusively from the cache 
When enabled, these changes prevent LMS application code from hitting the discovery service in-process to retrieve programs. Instead, program data is pulled from cache entries populated by a management command, cache_programs.

LEARNER-382
 2017-05-08 18:43:25 -04:00
Robert Raposa
ed5412eba9 Merge pull request #15059 from edx/robrap/LEARNER-868 
LEARNER-868: Default unified_course_view on in devstack.
 2017-05-08 14:23:14 -04:00
Cliff Dyer
65352c9d6c Merge pull request #15060 from edx/neem/handle-iter-errors 
Neem/handle iter errors
 2017-05-08 14:11:36 -04:00
Diana Huang
8231d2d05f Merge pull request #15058 from edx/diana/course-date-info-fix 
Only try to render dates when user is authenticated.
 2017-05-08 13:11:52 -04:00