Kevin Luo
3b32d4216c
Add delay to course bulk email task and use SITE_NAME for site url
...
Delay for possible race condition with fetching course email object.
Use settings.SITE_NAME for host name to generate email footer url.
2013-08-29 12:40:32 -04:00
Kevin Luo
3ea2b24b98
Add HTML editor for authoring bulk email message (adopted from CMS)
2013-08-29 12:40:32 -04:00
Kevin Luo
907bf6e1b7
Add bulk email feature for instructors, with optout option
...
Adds a new Email link to the instructor dashboard for frontend interface to send
email to course members. Adds a feature flag ENABLE_INSTRUCTOR_EMAIL to toggle this.
Creates a new djangoapp bulk_email that handles this action by getting the recipient
list and batching the emails to different celery tasks to do the actual sending.
Requires lynx package to convert HTML email to plaintext. Handles SMTP errors by
retrying or falling through to the next email. Adds the option to opt out of course
specific emails in the user dashboard with an Email Settings link for each course.
Uses severable configurable settings with defaults. DEFAULT_BULK_FROM_EMAIL
specifies the from address for email. EMAILS_PER_TASK specifies the number of emails
each celery task takes on. EMAIL_HOST, EMAIL_PORT, EMAIL_HOST_USER,
EMAIL_HOST_PASSWORD, and EMAIL_USE_TLS for the SMTP email backend settings.
Co-authored-by: Akshay Jagadeesh <akjags@gmail.com >
2013-08-29 12:40:31 -04:00
Frances Botsford
e6bfb887c4
more cleanup on photos for vcerts
2013-08-27 11:04:34 -04:00
Frances Botsford
28db6a2fda
cleanup on the photo page for vcerts
2013-08-27 10:55:09 -04:00
Will Daly
fe72730969
Integrate js-test-tool into testing infrastructure
2013-08-26 20:21:18 -04:00
Brian Talbot
af8339c72d
Verification: revised Sass organization - WIP
2013-08-26 19:25:52 -04:00
Frances Botsford
e5cede572a
fixing up some styling on vcerts
2013-08-26 18:36:56 -04:00
David Ormsbee
2012bb018f
Merge branch 'ormsbee/verifyuser' into ormsbee/verify2
2013-08-26 10:05:08 -04:00
David Ormsbee
0b625a6f2a
Merge branch 'ormsbee/verifyuser' into ormsbee/verify2
...
Conflicts:
lms/static/sass/views/_verification.scss
lms/templates/verify_student/photo_id_upload.html
2013-08-26 10:04:28 -04:00
Frances Botsford
770ec2dbb3
adjusting the progress bar styling for vcerts
2013-08-26 09:56:04 -04:00
Frances Botsford
b5302a192f
refinements to the vcert requirements page
2013-08-23 16:49:01 -04:00
David Ormsbee
da829b1681
Make client-side capture work for photo IDs
2013-08-23 13:20:25 -04:00
Frances Botsford
0fabba1553
added vcert images and some fake js functionality for photos
2013-08-23 13:08:05 -04:00
Frances Botsford
cb16852313
completed styling on select a track for verification
2013-08-23 10:17:52 -04:00
Frances Botsford
d4e8034fca
refinements on the verification html and sass
2013-08-22 23:25:57 -04:00
Frances Botsford
061b994eb7
initial html bones of the verification requirements page
2013-08-22 22:53:51 -04:00
Frances Botsford
e7b06c1a33
almost all of the styling for the select page of verification
2013-08-22 22:33:27 -04:00
David Ormsbee
acd01306fe
minor style change to keep videos from blowing out in verification
2013-08-22 18:09:36 -04:00
Vik Paruchuri
26a301f42e
Merge pull request #504 from edx/feature/vik/oe-ui
...
Feature/vik/oe ui
2013-08-22 12:23:29 -07:00
Vik Paruchuri
a06801432e
Fix staff grading test
2013-08-22 14:12:12 -04:00
David Ormsbee
4a70f7588e
Merge branch 'ormsbee/verifyuser' into ormsbee/verifyuser_func
...
Conflicts:
lms/djangoapps/verify_student/models.py
lms/djangoapps/verify_student/tests/test_models.py
lms/djangoapps/verify_student/tests/test_views.py
lms/djangoapps/verify_student/urls.py
lms/djangoapps/verify_student/views.py
lms/envs/dev.py
lms/templates/verify_student/face_upload.html
lms/templates/verify_student/photo_id_upload.html
lms/urls.py
2013-08-22 14:07:08 -04:00
Frances Botsford
0086a054d6
first pass at select a track for verification
2013-08-22 11:37:36 -04:00
Frances Botsford
c392349fb0
adjusted controls for v photos
2013-08-21 15:40:08 -04:00
Frances Botsford
abd678e464
initial step interaction for verification
2013-08-21 15:27:37 -04:00
Frances Botsford
07b94f7dd4
added font variables for LMS, more sass for verification
2013-08-20 21:59:23 -04:00
Miles Steele
cb7a3ad8eb
switch from log_event to Logger.log
...
keep log_event for compatibility
2013-08-20 16:52:18 -04:00
Frances Botsford
2e821be65f
adding some standard sass bits to LMS and bare bones sass for verification
2013-08-20 16:04:48 -04:00
Brian Talbot
fc4eb3786a
mktg - revised sass/css for iframed button to match styles/consistency
2013-08-19 10:25:29 -04:00
Vik Paruchuri
4f3ec68fb7
Scroll to top in peer and staff grading, preserve line breaks in submissions
2013-08-16 14:12:37 -04:00
Vik Paruchuri
be3291eeb0
Proper scoping, show status to staff, fix line break issues, multiple self assessments on one page work
2013-08-16 13:22:34 -04:00
Frances Botsford
445cf39f8b
updated styling for marketing side register button to accommodate second line of text
2013-08-16 10:39:45 -04:00
marco
72bb93d436
Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui
2013-08-15 13:57:05 -04:00
marco
7865fbe0df
cleaned up padding for peer review training and grading states, removed extraneous response label,fixed style issue on rubric for peer grading where rubric items had a background color overridding the intended style
2013-08-15 13:56:17 -04:00
Vik Paruchuri
9211a38374
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-08-15 11:36:11 -04:00
marco
c9807db308
styling of peer review interface for students along with minimal adjustments to the staff grading interface as well. added internationalization of peer grading strings.
2013-08-14 14:12:04 -04:00
marco
ab81000665
visual styling changes to staff grading and peer grading, along with additional instances of the use of the baseline variable instead of pixel definitions for padding and margins.
2013-08-13 14:42:34 -04:00
marco
68199da821
added oe-tools header areas to eventually consolitate all messaging
2013-08-09 18:44:15 -04:00
Miles Steele
f6fc1aeed9
hide empty management list selector, add explanation text
2013-08-09 14:22:56 -04:00
marco
166c4c6939
cleaned up merge issue in combined_open_ended.html
2013-08-09 11:31:33 -04:00
marco
e1cba4b0b4
cleaned up html structure for various pages, style fixed for show/hide prompt item
2013-08-09 11:26:59 -04:00
Vik Paruchuri
e39abe11db
Fix rubric with staff grading
2013-08-08 19:50:55 -04:00
Vik Paruchuri
687ab3ddae
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
common/lib/xmodule/xmodule/peer_grading_module.py
lms/templates/combinedopenended/combined_open_ended.html
lms/templates/combinedopenended/combined_open_ended_status.html
lms/templates/combinedopenended/openended/open_ended.html
lms/templates/combinedopenended/openended/open_ended_rubric.html
lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html
2013-08-08 19:03:46 -04:00
Miles Steele
fab16f37da
fix display name for profile distributions
2013-08-08 13:16:49 -04:00
Miles Steele
a15c2d7381
change to .text() extraction of template, fix SafeWaiter error handling
2013-08-08 13:16:48 -04:00
Miles Steele
e0760d95ab
add onExit handler, fix task polling, cleanup
2013-08-08 13:16:48 -04:00
Miles Steele
4afde4dd79
add proxied analytics graphs, refactor analytics
2013-08-08 13:16:48 -04:00
Miles Steele
35ffb1b347
add spacing to student admin section
2013-08-08 13:16:47 -04:00
marco
56dee21142
partial cleanup for submitted rubric state, along with sass format cleanup for rubric.scss
2013-08-07 16:35:14 -04:00
marco
ec99e20a35
styled rubric, dividers between sections
2013-08-02 13:37:53 -04:00
