Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

10211 Commits

Author SHA1 Message Date
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
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
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
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
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
Julia Hansbrough
259d728018 Merged in email confirmation modal 2013-10-10 17:06:38 +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
Adam Palay
3f8c2f55f5 disable buttons for large courses on legacy and beta instr dash 
set max enrollment for downloads to 200
 2013-10-10 17:06:34 +00:00
Julia Hansbrough
dba11a9677 Implemented bulk email interface for new dashboard 2013-10-10 17:06:34 +00:00
frances botsford
187fc8ea1c Merge pull request #1280 from edx/fix/frances/lms-video-dl-buttons2 
Improving the video and transcript download buttons
 2013-10-10 07:10:38 -07:00
Frances Botsford
5d509c2e08 addressing review feedback on video buttons - switched to use themeable color variables 2013-10-10 10:09:43 -04: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
Julia Hansbrough
47685af07d Defined baseUrl in the legacy instructor dashboard template, fixing a bug where the HTML editor would fail to load 2013-10-09 21:32:50 +00:00
David Baumgold
838f4df6b5 Merge pull request #1269 from edx/db/clarify-debug 
Clarify USE_I18N settings
 2013-10-09 13:55:30 -07:00
Don Mitchell
ec01253e30 Merge pull request #1240 from edx/dhm/config_separation 
Segregate the mongo db config from the modulestore config
 2013-10-09 13:24:30 -07:00
David Baumgold
cbaa3089ba Updated comment 2013-10-09 15:54:01 -04: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
David Baumgold
6c747e31bc Merge pull request #1273 from edx/db/fix-drag-and-drop-requirejs 
make drag_and_drop component work with requirejs and changed static url
 2013-10-09 12:16:55 -07:00
Frances Botsford
729c0bca09 updating video download links to a list - review feedback 2013-10-09 14:40:01 -04: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
David Baumgold
8906cffb22 correct placement of baseUrl variable, use it to configure requirejs 2013-10-09 11:28:46 -04:00
Carlos Andrés Rocha
fd7293144e Merge pull request #1263 from rocha/add-config-root-env-variable-to-aws-config 
Add variable to set location of config files on aws
 2013-10-09 07:45:16 -07: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
Gabe Mulley
5359e2ebef Merge pull request #1207 from mulby/gabe/tracking-tests 
add acceptance tests for event tracking
 2013-10-09 07:08:49 -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
David Baumgold
16ca0252b3 Clarify USE_I18N settings 
@jzoldak showed me that setting `USE_I18N = DEBUG` didn't actually accomplish
what I had hoped it would -- changing DEBUG didn't also change USE_I18N.
This pull request accomplishes what I was trying to accomplish, without being
quite so clever about it.
 2013-10-09 09:04:12 -04:00
David Baumgold
4879b06c2a Merge pull request #1235 from edx/db/tie-i18n-to-debug 
Tie the USE_I18N setting to DEBUG setting
 2013-10-09 05:45:20 -07: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
Don Mitchell
44d0494d33 Segregate the mongo db config from the modulestore config 
as a first step to separating db connection from modeling
and to support location mapper and contentstore using same db config as modulestore
 2013-10-08 15:01:48 -04:00