brianhw
f831a0adcb
Merge pull request #1406 from edx/post-release-2013-10-17-master
...
Post release 2013 10 17 master
2013-10-18 11:16:24 -07:00
Brian Wilson
aa172272f3
Update master with hotfixes from release-2013-10-17.
2013-10-18 11:50:42 -04:00
Jay Zoldak
494a618c1a
Change logic for section selection in navigation tests.
2013-10-18 09:38:20 -04:00
Ned Batchelder
d3c7c0834d
Simple cleanups of DictFieldData
...
I tried to make DictFieldData strict about only being used with one
block. That effort failed ultimately, but these are reasonable changes
I made along the way.
2013-10-18 04:51:42 -04:00
Gabe Mulley
c1450c8375
Merge pull request #1349 from mulby/gabe/course-id-context
...
add course_id to all emitted events
2013-10-17 15:45:37 -07:00
Jason Bau
e5cda013a2
Merge pull request #1357 from edx/jbau/shoppingcart-user-middleware
...
Jbau/shoppingcart user middleware
2013-10-17 15:41:11 -07:00
Gabe Mulley
d2b03e28fb
add course_id to event context
2013-10-17 17:44:01 -04:00
Greg Price
0138322c2b
Merge pull request #1371 from edx/gprice/cs-request-logging
...
Log all comments service requests
2013-10-17 14:32:04 -07:00
Jason Bau
7223bb125e
make condition inline
2013-10-17 14:21:44 -07:00
Sarina Canelake
b3faf5c476
Merge pull request #1390 from edx/sarina/disable-student-email-settings-with-auth
...
Student Dash: Disable "Email Settings" when course isn't authorized
2013-10-17 12:17:58 -07:00
Sarina Canelake
9fb1d9ecf2
Remove 'Email Settings' link on student dashboard for unauth courses
2013-10-17 15:10:47 -04:00
brianhw
ff7d906d07
Merge pull request #1388 from edx/brian/fix-email-subtask-dupes
...
Check that a subtask has not already completed before running.
2013-10-17 11:22:21 -07:00
Sarina Canelake
582e21b92d
Course Auth tests for legacy dash
2013-10-17 13:49:42 -04:00
Sarina Canelake
951837f7c9
Catch email exceptions on the legacy dash
2013-10-17 13:39:13 -04:00
Brian Wilson
a699674015
Check that a subtask has not already completed before running.
2013-10-17 13:32:44 -04:00
Don Mitchell
978c19dd2c
Merge pull request #1325 from edx/dhm/paginate_assets
...
Add asset pagination
2013-10-17 07:16:09 -07:00
Don Mitchell
214a3bd251
pylint/pep8 cleanups
2013-10-17 09:52:13 -04:00
Will Daly
17d8bd219a
Merge pull request #1319 from edx/will/enable-bulk-email-tests
...
Enable and update bulk email acceptance test
2013-10-17 05:44:48 -07:00
David Ormsbee
fc320ffef0
Merge pull request #1334 from edx/fix/ichuang/instructor-dashboard-grades-for-assignment
...
Fix/ichuang/instructor dashboard grades for assignment
2013-10-17 03:43:17 -07:00
Greg Price
bd477581b6
Log all comments service requests
...
Logging the duration of each request will allow us to determine
whether there is a significant difference in the latency reported by
the comments service and that observed by the LMS. Each request will
be assigned a unique identifier to allow correlation of the reported
latency on each end.
2013-10-16 16:31:59 -04:00
brianhw
5918ee557f
Merge pull request #1351 from edx/brian/fix-dupe-emails
...
Check that email subtasks are known to the InstructorTask before executing.
2013-10-16 12:18:04 -07:00
Jason Bau
ec8871206a
use context processor instead of middleware
2013-10-16 12:16:10 -07:00
Greg Price
17e2221604
Merge pull request #1326 from edx/gprice/cs-header-auth
...
Use HTTP header for comments service auth
2013-10-16 12:07:20 -07:00
Sarina Canelake
86c4a03eba
admin-console support for enabling email per course
2013-10-16 13:02:41 -04:00
Brian Wilson
b8239068cb
Check that email subtasks are known to the InstructorTask before executing.
2013-10-16 13:02:41 -04:00
Brian Wilson
9861c935dd
Change calls in beta instructor dash.
2013-10-16 13:02:41 -04:00
Brian Wilson
87a72b7e99
Rename some constants, and refactor bulk email task flow.
2013-10-16 13:02:40 -04:00
Brian Wilson
bc599a0662
Update tests with more complete coverage.
2013-10-16 13:02:40 -04:00
Brian Wilson
e75dd4654b
Move subtask update logic that was only needed for tests into the tests that needed it.
2013-10-16 13:02:40 -04:00
Brian Wilson
4505fb4e2c
Update InstructorTask before performing a retry.
2013-10-16 13:02:40 -04:00
Brian Wilson
c5debc22e7
Add settings to cap infinite retries.
2013-10-16 13:02:36 -04:00
Brian Wilson
41fcd9627b
Don't send emails to students who haven't activated.
2013-10-16 13:02:00 -04:00
Brian Wilson
eaec962de9
Internationalize task progress.
2013-10-16 13:01:59 -04:00
Brian Wilson
df0fba9db8
Add more task-level tests for retries and other errors. Respond to initial comments.
2013-10-16 13:01:59 -04:00
Brian Wilson
04f90fee41
Fix subtask code to handle (tests) running in eager mode.
2013-10-16 13:01:59 -04:00
Brian Wilson
a4c35ac4ff
Use separate retry count for calculating retry delay.
2013-10-16 13:01:59 -04:00
Brian Wilson
7b7afd472d
Incorporate changes in max_retry logic, adding subtask_status as bulk_email arg.
2013-10-16 13:01:59 -04:00
Brian Wilson
08a08448ee
Add some handling for SES exceptions.
2013-10-16 13:01:59 -04:00
Brian Wilson
c133fd9168
Use HIGH_PRIORITY_QUEUE for send_course_email.
2013-10-16 13:01:59 -04:00
Brian Wilson
0fd75181e3
Update handling of bulk-email retries to update InstructorTask before each retry.
2013-10-16 13:01:58 -04:00
Brian Wilson
7988b71b09
Move updates for InstructorTask into BaseInstructorTask abstract class.
2013-10-16 13:01:58 -04:00
Brian Wilson
5c29530db9
Factor out subtask-specific code into subtasks.py.
2013-10-16 13:01:58 -04:00
Brian Wilson
01611c33a6
Refactor instructor_task tests, and add handling for general errors in bulk_email subtasks.
2013-10-16 13:01:58 -04:00
Brian Wilson
2f4774f47c
Pass status into course_email for tracking retry status.
2013-10-16 13:01:58 -04:00
Brian Wilson
ffbb228acb
Add support for counting and reporting skips in background tasks.
2013-10-16 13:01:58 -04:00
Brian Wilson
8fddcdffcd
Initial refactoring for bulk_email monitoring.
2013-10-16 13:01:57 -04:00
Brian Wilson
67a8ee1184
Revert remnants of disable-button, and how html editor is invoked.
2013-10-16 13:01:57 -04:00
Julia Hansbrough
8a30e9ba8f
Legacy email tests, removed duplicate code, updated comments, fixed CSS
2013-10-16 13:01:57 -04:00
Julia Hansbrough
fd54b060d8
added self to authors style, changed GET to POST
2013-10-16 13:01:57 -04:00
Julia Hansbrough
c7d4270ad4
API tests, email tests, working notifications
2013-10-16 13:01:57 -04:00
