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

18358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
d871d97112 Merge pull request #1383 from edx/talbs/fix-wiki-css 
LMS: FIX - Updates Wiki Templates to Use Re-architected CSS
 2013-10-17 10:36:28 -07:00
Brian Talbot
5e46796e90 LMS: updates wiki templates to reference new pipeline assets 2013-10-17 11:46:22 -04:00
brianhw
12d98daecf Merge pull request #1376 from edx/adam/disable-accounts-2 
Adam/disable accounts 2
 2013-10-16 15:01:46 -07:00
Adam Palay
085d679abe add to changelog 2013-10-16 17:48:35 -04:00
Brian Talbot
a4009d7834 Merge pull request #1372 from edx/talbs/fix-css-vendor 
LMS/Common Vendor CSS Organization
 2013-10-16 14:41:45 -07:00
Adam Palay
1fc993ce18 add functionality to disable users 
add middleware to detect students with disabled accounts

add tests
 2013-10-16 16:57:11 -04:00
Adam Palay
421174980a add UserStanding model 
add migration
 2013-10-16 16:57:06 -04:00
Brian Talbot
5de21ae541 adds/relocates shared vendor css (and assets) to static directories 2013-10-16 16:45:32 -04:00
brianhw
97e01be147 Merge pull request #1359 from edx/brian/bulk-email-rc 
Bulk Email improvements for release
 2013-10-16 10:26:28 -07:00
brianhw
291db0ab6d Merge pull request #1365 from edx/talbs/lms-cssarch 
LMS: Revised CSS Architecture (resolves LMS_1020)
 2013-10-16 10:18:03 -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
22285da1e5 Switch to 0.2.6 version of diff-cover. 2013-10-16 13:02:40 -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
9c94263d07 Removed email acceptance test 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
Julia Hansbrough
b8aff26ce8 Merged in email confirmation modal 2013-10-16 13:01:57 -04:00
Will Daly
3f88b87916 Added acceptance tests for bulk email (through beta dashboard) 2013-10-16 13:01:57 -04:00
Julia Hansbrough
d8a857dba2 Changed GET to POST and xmodule HTML editor call, section CSS 2013-10-16 13:01:52 -04:00
Julia Hansbrough
867d3ba1da 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-16 13:01:14 -04:00
Adam Palay
d69748ce7f disable buttons for large courses on legacy and beta instr dash 
set max enrollment for downloads to 200
 2013-10-16 13:01:14 -04:00
Julia Hansbrough
91c31e12d5 Implemented bulk email interface for new dashboard 2013-10-16 13:01:14 -04:00
Brian Talbot
bbcb381092 LMS: adds in redundant, but needed dashboard visual padding rule 2013-10-16 12:29:49 -04:00
Brian Talbot
e0b73b05f2 LMS: removes error on <html> element syntax for iframed register buttons 2013-10-16 12:29:49 -04:00
Brian Talbot
e379a770b8 LMS: removes ie-fixes static:css group from all template references 2013-10-16 12:29:49 -04:00
Brian Talbot
56b2205e25 LMS: corrects indentation issue in hint_manager.html template 2013-10-16 12:29:49 -04:00
Brian Talbot
ef2218296f LMS: revises CSS reference/pipeline architecture to handle IE9 selector limits 2013-10-16 12:29:49 -04:00