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

16142 Commits

Author SHA1 Message Date
Douglas Hall
d22afb8c92 Fix formatting issues with LMS account activation email. 
This removes extra whitespace in the body of the LMS account activation email.

ENT-388
 2017-05-16 12:53:43 -04:00
Cliff Dyer
af4cf7bfd9 Merge pull request #15061 from edx/neem/retry-compute-grades 
Add single retry to compute_grades tasks.
 2017-05-16 12:31:36 -04:00
sanfordstudent
3278fcf1d6 Merge pull request #15045 from edx/neem/handle_unrescorable 
400 for non-rescorable blocks
 2017-05-16 10:36:33 -04:00
Renzo Lucioni
5314784a4d Handle expired enrollments on the program detail page 
Learners should be able to enroll in future runs of courses in which they have an expired enrollment. Previously, the course card model populated itself by selecting the first course run in which the user was enrolled. When the user tried to enroll in another run, nothing would happen because they were already enrolled in the run the page was trying to enroll them in.

Instead of blindly choosing the first run in which the user is enrolled, we now fall through to the same behavior we use for courses in which the user is not enrolled when the user has expired enrollments.

LEARNER-933
 2017-05-16 10:02:28 -04:00
Sanford Student
8cfff9a883 400 for non-rescorable blocks 2017-05-16 09:45:37 -04:00
Renzo Lucioni
efbb5ed673 Tighten up program details view 
Condense view logic left over from removal of Waffle switch.

ECOM-6602
 2017-05-15 18:01:23 -04:00
Matthew Piatetsky
131cc0bdbb Remove old program detail page and Waffle switch gating the new page 
The new page is released and stable. The switch and old code are no longer necessary.

ECOM-7482
 2017-05-15 16:35:03 -04:00
Adam
93616b0881 Merge pull request #15108 from edx/adam/fix-bulk-email-for-track 
fix for issue where emails to students in one track are sent to users…
 2017-05-15 10:43:24 -04:00
Calen Pennington
6c4fbd3c11 Merge pull request #15088 from cpennington/footer-support-lang-variants 
Support fallback to supported language variants in the footer
 2017-05-15 09:00:00 -04:00
Adam Palay
c478e796d2 fix for issue where emails to students in one track are sent to users in other tracks, too (EDUCATOR-217) 2017-05-15 08:48:11 -04:00
Calen Pennington
03b23da980 Support fallback to supported language variants in the footer 2017-05-15 07:36:38 -04:00
rabiaiftikhar
ffa9b7efe3 EDUCATOR-217-364 add logs in bulk email 2017-05-15 09:50:58 +00:00
J. Cliff Dyer
c61f2ddc69 Update xblock requirement to 1.0.0. 2017-05-12 14:51:02 -04:00
Brittney Exline
69d85dc103 Merge pull request #14985 from open-craft/jill/update-registration-login 
ENT-332/ENT-333 Updates Register and Login as per new design
 2017-05-12 11:07:10 -04:00
Renzo Lucioni
78a9b1f0ae Remove use of read_cached_programs switch 
The read_cached_programs switch was used to control the release of changes for reading programs exclusively from the cache. With those changes stable, the switch is no longer necessary.

LEARNER-382
 2017-05-12 11:06:08 -04:00
Matt Drayer
278fea9d75 Merge pull request #15055 from edx/mattdrayer/ENT-307 
ENT-307: Add waffle switch to disable account activation requirement for onboarding
 2017-05-12 09:49:46 -04:00
Edward Zarecor
4d1694d0e5 Merge pull request #15090 from edx/e0d/icp-footer 
Basic support for an optional ICP number in the footer
 2017-05-12 09:28:01 -04:00
Jillian Vogel
71ba54a963 Updates combined Register, Login, and Password Reset views as per new design 
* Reorders form fields, and updates labels, placeholders, and tip text
* Increases clickable area for links and labels.
* Removes "*" markers from required fields, and instead adds
  "(optional)" labels to visible optional fields.
* Updates font colors and sizes, and removes box shadows
* Adds custom drop-down styles
* Improves responsive design scaling for small screens
* Make Terms of Service and Honor Code open in new window to avoid losing form
  field values.
 2017-05-12 09:18:36 -04:00
Adeel Khan
73e6029de7 Logging Sailthru api call time for exploring optimal connection timeout value. 
ECOM-7772
 2017-05-12 17:06:55 +05:00
Ned Batchelder
25aa711ec8 Update translations (autogenerated message) 2017-05-12 06:28:34 -04:00
Alex Dusenbery
b33a9436d6 TNL-6832 | Include inactive enrollees in course and problem grade reports. 2017-05-11 13:10:38 -04:00
Sanford Student
42fe9bd9b3 treat empty string as None for letter grades 2017-05-11 10:00:19 -04: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
Edward Zarecor
6aea3dc041 Basic support for an optional ICP number in the footer 2017-05-10 16:43:30 -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
Sanford Student
b6b704019f Revert "Fix column alignment issue when Teams is disabled" 
This reverts commit e97283ae44.
 2017-05-10 12:10:48 -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
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
Nimisha Asthagiri
e97283ae44 Fix column alignment issue when Teams is disabled 2017-05-09 19:44:34 -04:00
Matt Drayer
b455bd8a98 mattdrayer: Add flag to disable account activation requirement for onboarding 2017-05-09 17:37:25 -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
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
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
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
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
J. Cliff Dyer
16acfef8ff Add single retry to compute_grades tasks. 2017-05-08 13:52:27 -04:00
Diana Huang
c0b7f9b82d Only try to render dates when user is authenticated. 2017-05-08 12:24:24 -04:00
J. Cliff Dyer
5beae9d1e8 Raise error at first encounter during compute_grades_for_course(_v2) task 2017-05-08 12:18:32 -04:00
J. Cliff Dyer
cebdbc18e7 Update CourseGradeFactory().iter() to return exception objects 2017-05-08 12:16:52 -04:00