Commit Graph

14096 Commits

Author SHA1 Message Date
Sarina Canelake
c24087a912 django-admin command for enabling email per course 2013-10-11 16:39:12 -04: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
62cc9e77bf Use HTTP header for comments service auth
Previously, authentication was done using a URL parameter, which would
appear in various logs. Now, authentication is done more appropriately
with an HTTP header. Note that this requires cs_comments_service commit
cf39aabdd160176ebf206ca19d3ee030161a0b47 or later.
2013-10-11 12:01: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
Brian Wilson
649b4260b6 Change calls in beta instructor dash. 2013-10-10 16:15:58 -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
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
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
Julia Hansbrough
fbeb2206d4 Legacy email tests, removed duplicate code, updated comments, fixed CSS 2013-10-10 17:06:41 +00:00
Julia Hansbrough
86321c2cc1 added self to authors style, changed GET to POST 2013-10-10 17:06:40 +00:00
Julia Hansbrough
bce220d7ab API tests, email tests, working notifications 2013-10-10 17:06:39 +00:00
Will Daly
c66b5dc3d4 Added acceptance tests for bulk email (through beta dashboard) 2013-10-10 17:06:38 +00:00
Julia Hansbrough
e325317bde Changed GET to POST and xmodule HTML editor call, section CSS 2013-10-10 17:06:37 +00:00
Julia Hansbrough
75eddb6a15 Implemented bulk email interface for new dashboard
Responses to Adam's comments; reset common.py, i18n compliance, deleted extraneous email.html file, fixed an HttpResponse, deleted unnecessary commented-out code, some small style tweaks
2013-10-10 17:06:36 +00:00
Julia Hansbrough
dba11a9677 Implemented bulk email interface for new dashboard 2013-10-10 17:06:34 +00:00
Ned Batchelder
9dba84fe1f Merge pull request #1197 from edx/ned/quiet-lti-server-test
Suppress request logging in the LTI test server.
2013-10-10 06:50:31 -07:00
Joe Blaylock
8ef8fc8281 Certificates: Add regeneration command
* Adds regenerate_user command, which lets you run certificates for one
  particular user in one particular class, regardless of whether they
  have a pre-existing certificate.
2013-10-09 12:24:35 -07:00
Sarina Canelake
650c913110 Merge pull request #1260 from edx/sarina/email_FROM_address
Change the default FROM address for bulk email
2013-10-09 08:57:00 -07:00
Chris Dodge
8f9d815f10 add some middleware to determine whether draft modulestore or non-draft modulestore should be used
change to use regex to do the domain mappings. Also add config to AWS to be able to set from configuration file.

handle cases where HTTP_HOST is none, like in unit tests

add linefeed at end

fix up regex matches

switch to use thread local storage to hold the request itself

.

.

convert over to use open source 3rd party library

convert over to use django-cum

add unit test

remove comment

.

add comment to config setting

fix comment

use better regex for localdev

no need to break

no need to wrap an imported function, it's visible to any file that is importing us

add comment

add unit test

clean up test

use a separate env file to set the preview hostname
2013-10-09 11:53:26 -04:00
Calen Pennington
46ed857c1a Merge pull request #1221 from cpennington/lms-xblock-css-js
Put XBlock css and javascript onto the LMS courseware page
2013-10-09 07:21:39 -07:00
Ned Batchelder
ca345d92cc Write to stdout to keep messages, but not pollute tests. 2013-10-09 10:03:10 -04:00
Ned Batchelder
3c2d1003b4 Suppress request logging in the LTI test server. 2013-10-09 09:42:11 -04:00
Calen Pennington
2514dca550 Put XBlock css and javascript onto the LMS courseware page
This required changing structural XModules to fully implement
student_view, rather than just returning the HTML of their children in a
get_html call.

[LMS-223]
[LMS-1170]
2013-10-09 09:40:47 -04:00
Gabe Mulley
17a0479849 add acceptance tests for event tracking 2013-10-09 08:09:14 -04:00
Sarina Canelake
c9172b79e6 Change the default FROM address for bulk email 2013-10-08 16:38:08 -04:00
Calen Pennington
658810a94f Use xblock render shortcuts 2013-10-08 15:58:23 -04:00
Calen Pennington
d785b1e213 Convert due_date_display_format tests to use factories
Previously, these tests modified due_date, which failed due to the new
restrictions on writing to Scope.settings from the LMS.
2013-10-08 15:29:17 -04:00
Calen Pennington
6b474724ac Make XModuleDescriptor and XModule act as a single class
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
2013-10-08 15:29:17 -04:00
David Baumgold
15b65fbecc Fix static links for footer images 2013-10-08 11:39:22 -04:00
Ned Batchelder
a03a11e0e7 Merge pull request #1253 from edx/ned/use-assertisinstance
Use assertIsInstance where we can
2013-10-08 07:47:21 -07:00