Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,575 Commits 1 Branch 0 Tags
1007f5aeb4455c439d014a30135c4eade1e5a75b
Commit Graph

18575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
1007f5aeb4 load gettext on every page 2013-10-11 17:11:59 -04:00
Sarina Canelake
6605f60e9e Merge pull request #1322 from edx/sarina/bulk-email-admin 
django-admin command for enabling email per course
 2013-10-11 14:10:17 -07:00
Sarina Canelake
c24087a912 django-admin command for enabling email per course 2013-10-11 16:39:12 -04:00
Greg Price
56e0c6ba88 Merge pull request #1323 from edx/gprice/for-155 
Require login for followed_threads
 2013-10-11 10:44:39 -07:00
Greg Price
c1cbeaecfb Merge pull request #1321 from edx/gprice/forum-loading-a11y 
Add accessible text to forum loading animations
 2013-10-11 10:07:21 -07:00
Greg Price
a63d6a70d4 Require login for followed_threads 
Without the login_required decorator, an error would occur, causing a
500 to be returned. This fixes FOR-155.
 2013-10-11 12:28:59 -04:00
Greg Price
1187e71880 Add accessible text to forum loading animations 2013-10-11 10:52:10 -04:00
Christina Roberts
11142c7cbb Merge pull request #1300 from edx/christina/fix-rounding-error 
Grading rounding error.
 2013-10-11 07:33:26 -07:00
frances botsford
0231f2a304 Merge pull request #1312 from edx/frances/fix/studio-sass-view-fix 
Fix for a sass cleanup issue on the Studio sign in page
 2013-10-11 06:52:25 -07:00
Frances Botsford
4fc801f09f fix for forgot password alignment on studio log in page 2013-10-11 09:51:44 -04:00
Greg Price
71a394c34a Merge pull request #1301 from edx/gprice/forums-500 
Make forums endpoints return better status codes
 2013-10-10 14:13:40 -07:00
brianhw
369ea7fefd Merge pull request #1209 from edx/brian/email-grouping 
Task progress notification on instructor dash
 2013-10-10 13:55:30 -07:00
Brian Talbot
f663967198 Merge pull request #1313 from edx/talbs/fix-studio-tendertag 
Studio: FIX - Cutting the Tender Tag
 2013-10-10 13:42:40 -07:00
Brian Talbot
03c9a46d79 Studio: visually hides the tender widget tag UI, again 2013-10-10 16:37:31 -04:00
Brian Wilson
649b4260b6 Change calls in beta instructor dash. 2013-10-10 16:15:58 -04:00
Brian Wilson
7abd4e363d Switch to 0.2.6 version of diff-cover. 2013-10-10 15:34:16 -04:00
Brian Wilson
58bacb4e67 Rename some constants, and refactor bulk email task flow. 2013-10-10 15:34:16 -04:00
Brian Wilson
03b4330c04 Update tests with more complete coverage. 2013-10-10 15:34:16 -04:00
Brian Wilson
39e8b718ca Move subtask update logic that was only needed for tests into the tests that needed it. 2013-10-10 15:34:16 -04:00
Brian Wilson
b909662d6e Update InstructorTask before performing a retry. 2013-10-10 15:34:15 -04:00
Brian Wilson
a6bd1c2132 Add settings to cap infinite retries. 2013-10-10 15:34:06 -04:00
Brian Wilson
8910ea08b1 Don't send emails to students who haven't activated. 2013-10-10 15:33:00 -04:00
Brian Wilson
653442be43 Internationalize task progress. 2013-10-10 15:33:00 -04:00
Brian Wilson
c787a8f500 Add more task-level tests for retries and other errors. Respond to initial comments. 2013-10-10 15:32:59 -04:00
Brian Wilson
e052dde4f5 Fix subtask code to handle (tests) running in eager mode. 2013-10-10 15:32:59 -04:00
Brian Wilson
506f91a95e Use separate retry count for calculating retry delay. 2013-10-10 15:32:59 -04:00
Brian Wilson
32c846249f Incorporate changes in max_retry logic, adding subtask_status as bulk_email arg. 2013-10-10 15:32:59 -04:00
Brian Wilson
853cd874e1 Add some handling for SES exceptions. 2013-10-10 15:32:59 -04:00
Brian Wilson
62bc32d4fd Use HIGH_PRIORITY_QUEUE for send_course_email. 2013-10-10 15:32:59 -04:00
Brian Wilson
42033ca80c Update handling of bulk-email retries to update InstructorTask before each retry. 2013-10-10 15:32:59 -04:00
Brian Wilson
e2d985209c Move updates for InstructorTask into BaseInstructorTask abstract class. 2013-10-10 15:32:58 -04:00
Brian Wilson
c01fa459a3 Factor out subtask-specific code into subtasks.py. 2013-10-10 15:32:58 -04:00
Brian Wilson
d171dc3efc Refactor instructor_task tests, and add handling for general errors in bulk_email subtasks. 2013-10-10 15:32:58 -04:00
Brian Wilson
2337b6d863 Pass status into course_email for tracking retry status. 2013-10-10 15:32:58 -04:00
Brian Wilson
8f31acbeb4 Add support for counting and reporting skips in background tasks. 2013-10-10 15:32:58 -04:00
Brian Wilson
d48e90ee22 Initial refactoring for bulk_email monitoring. 2013-10-10 15:32:58 -04:00
David Baumgold
5d47779beb Merge pull request #1304 from edx/db/fix-requirejs-jquery 
Ensure that jQuery loads before any other JS dependency
 2013-10-10 11:58:53 -07:00
Greg Price
83a8c8b2c5 Merge pull request #1265 from edx/gprice/forum-flag-a11y 
Improve accessibility of forums flagging feature
 2013-10-10 11:37:35 -07:00
David Baumgold
3e9c09e097 Ensure that jQuery loads before any other JS dependency 2013-10-10 14:27:29 -04:00
David Baumgold
cf66d0a52a Merge pull request #1303 from edx/db/source-edit-leanModal 
source-edit.html depends on leanModal
 2013-10-10 11:26:55 -07:00
Julia Hansbrough
f397e66127 Merge pull request #1215 from edx/flowerhack/feature/bulkemailnewdash_testingcoverage 
Flowerhack/feature/bulkemailnewdash testingcoverage
 2013-10-10 11:26:21 -07:00
Greg Price
b60f5f807d Make forums endpoints return better status codes 
Previously, AJAX calls would return 400, and page views and attempts
to load inline discussions would return 404 if communication with the
comments service failed. Now such problems cause a 500 status code.
 2013-10-10 14:20:48 -04:00
Greg Price
6734053c38 Increase color contrast for forum features 
The icons and text for pinning and flagging ("Report Misuse") had
contrast ratios that did not meet the minimum WCAG requirement of 4.5.
This fixes FOR-200.
 2013-10-10 14:14:23 -04:00
Greg Price
69859cff5b Improve accessibility of forums flagging feature 
The "Report Misuse" div is now focusable, responds to keyboard input,
and has appropriate attributes to indicate that it is a toggle button.
This fixes FOR-201 and FOR-209.
 2013-10-10 14:14:23 -04:00
Julia Hansbrough
c18f45095c Removed email acceptance test 2013-10-10 17:40:25 +00:00
John Jarvis
92a7d75b5d Merge pull request #1305 from edx/jarv/revert-1240 
Revert "Merge pull request #1240 from edx/dhm/config_separation"
 2013-10-10 10:27:58 -07:00
chrisndodge
82e42cc580 Merge pull request #1156 from edx/feature/cdodge/add-preview-configs-via-middleware 
add some middleware to determine whether draft modulestore or non-draft ...
 2013-10-10 10:24:51 -07:00
David Baumgold
b80d1572f0 source-edit.html depends on leanModal 2013-10-10 13:16:15 -04:00
John Jarvis
a517dc2085 Revert "Merge pull request #1240 from edx/dhm/config_separation" 
This reverts commit ec01253e30, reversing
changes made to ae8c9710e5.
 2013-10-10 13:14:08 -04:00
Julia Hansbrough
fbeb2206d4 Legacy email tests, removed duplicate code, updated comments, fixed CSS 2013-10-10 17:06:41 +00:00