Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

1258 Commits

Author SHA1 Message Date
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
Calen Pennington
658810a94f Use xblock render shortcuts 2013-10-08 15:58:23 -04:00
Adam Palay
197f9015aa disable buttons for large courses on legacy and beta instr dash 
set max enrollment for downloads to 200
 2013-10-07 10:11:08 -04:00
Sarina Canelake
66b8e1fc8e Merge pull request #1195 from edx/sarina/more-ins-dash 
Sarina/more ins dash
 2013-10-03 12:58:40 -07:00
Sarina Canelake
1251003d10 Remove enrollment from Student Admin page of new instructor dash 2013-10-03 15:57:31 -04:00
Calen Pennington
230bf0c643 Switch get_html replacement out for using wrap_child 2013-10-03 14:28:19 -04:00
Adam Palay
c9ce25bcb2 small unicode fix in instr dash 2013-10-02 16:24:13 -04:00
Sarina Canelake
91d85f5c2a Enable alerts when a task succeeds. 
Note: Alerts are pop-up boxes. Not sure if this is desireable, but I couldn't figure out
how to make a success message show up in the same place that error messages do.
 2013-09-27 12:17:53 -04:00
Sarina Canelake
086f544a1a Fix, and add more, tests 2013-09-27 12:17:45 -04:00
Sarina Canelake
07e76b3b2f Enable use of student usernames on student admin page 
This is in addition to email addresses, which also work.
 2013-09-27 12:17:35 -04:00
Sarina Canelake
8a2bd25b7c Visual rearrangement of new dash "Student Admin" page 2013-09-27 12:17:24 -04:00
Nick Parlante
d225b85d1a Port get-anonymized-id feature to new instructor dashboard 2013-09-25 13:52:05 -07:00
Nick Parlante
1b5903935e Add "Download CSV of all student anonymized IDs" button to instructor dashboard 
This is a recurrent ops problem, so we wanted to make it available
on the instructor dashboard.
 2013-09-24 12:59:42 -07:00
Adam
75b7514c4f Merge pull request #965 from felipemontoya/features/fmo/lms-i18n-strings 
Features/fmo/lms i18n strings
 2013-09-19 12:05:35 -07:00
Felipe Montoya
893d22515d Something for the user dashboard 2013-09-19 10:52:29 -05:00
Ned Batchelder
bbf508ca7b fix-setattr-and-getattr 2013-09-13 14:44:49 -04:00
Adam Palay
8bbc11cb2b rename stripping function, make it more explicit 2013-09-12 10:10:19 -04:00
Adam Palay
bc424173ad move _clean_fields to tools.py 2013-09-12 10:10:18 -04:00
Adam Palay
640d00c5be strip processed fields in instructor dash 2013-09-12 10:10:18 -04:00
Adam Palay
f446c88f4d fix tests 2013-09-12 09:32:34 -04:00
Adam Palay
bc70b1d9da change formatting for email messages to use full_name instead of first_ and last_name 
fix templates
 2013-09-12 09:32:34 -04:00
David Baumgold
45f38ddf81 Update requests library to 1.2.3 2013-09-10 09:59:21 -04:00
Vik Paruchuri
499d272adc Merge pull request #825 from edx/fix/vik/staff-information 
Staff information about duplicate ORA submissions
 2013-09-06 14:14:31 -07:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Vik Paruchuri
a6068201e1 Add in a staff warning message about duplicates 2013-09-05 12:29:21 -04:00
Sarina Canelake
577aeed35a Don't fetch the editor for XML courses 2013-09-04 11:31:52 -04:00
Jason Bau
b0f9fd0df5 Add link in lms legacy instructor dashboard to cms course_index 
A one-click way of getting to editing the course
 2013-08-31 01:07:34 -07:00
David Adams
c8b2863a46 Slightly change email registration template 
Added some text to guide the student to register with a particular email address.
    This is the one that was entered into the enrollment/invitation form by the instructor.
    Modified the template and associated test.
 2013-08-29 15:27:30 -07:00
Jason Bau
c160a189ad Bulk email - final tweaks and cleanup 2013-08-29 12:40:34 -04:00
Brian Wilson
8f93051d30 Add editable templates for bulk email 
Adds the edX Marketing-approved template as html default.
 2013-08-29 12:40:34 -04:00
Jason Bau
d341d6d26d Change optout to use user.id instead of email. 
Includes Data + Schema migrations for optout email -> user.id change.
Note that migrations should be reversible.
 2013-08-29 12:40:33 -04:00
Sarina Canelake
52d9320e62 Hide "Email Settings" from student dash if bulk email not enabled 
Some minor pep8 cleanup
 2013-08-29 12:40:33 -04:00
Sarina Canelake
e6bde93837 Change bulk email model field names and add migrations 2013-08-29 12:40:33 -04:00
Sarina Canelake
b3bc4023b0 Refactor html->plaintext conversion (for bulk email) into separate library 2013-08-29 12:40:33 -04:00
Sarina Canelake
f98d6764b2 Disable bulk email for XML-backed courses 2013-08-29 12:40:32 -04:00
Sarina Canelake
65f7b098dd Bulk Email: Add design styling 
Switch to using decorators; refactor and cleanup tests.
 2013-08-29 12:40:32 -04:00
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
Calen Pennington
4b1fa6b316 Merge pull request #690 from cpennington/one-time-startup 
One time startup centralization
 2013-08-27 12:19:42 -07:00
Calen Pennington
407b02b358 Centralize startup code, and execute in all contexts 
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
 2013-08-27 12:12:20 -04:00
Felix Sun
6e64e994f6 Fixed a test broken when the mixed modulestore was introduced. 2013-08-26 09:46:29 -04:00
Felix Sun
74ed2dafb3 Improved docstrings. 2013-08-26 09:40:06 -04:00
Felix Sun
d9517ea13e Fixed tests for removing hash access to hints. Fixed instructor view for same. 2013-08-26 09:40:04 -04:00
Felix Sun
4ee8111cf4 Fixed monkey-patching persistent state bug. 2013-08-26 09:40:03 -04:00
Felix Sun
6b40c5cf13 Changed hint voting ui to show all hints on one page. 
Fixed broken tests for hint manager.
 2013-08-26 09:40:03 -04:00
Felix Sun
199b632513 Crowdsourced hinter now supports formula responses. Tests still broken. 2013-08-26 09:40:03 -04:00
Will Daly
736b3e0ecd Common djangoapps no longer access courseware; other cleanup 2013-08-22 14:08:35 -04:00