Commit Graph

362 Commits

Author SHA1 Message Date
Jeremy Bowman
669aa13ad6 PLAT-1873 to_deprecated_string() cleanup part 2 2018-01-08 17:26:55 -05:00
Awais Jibran
4431cec4d0 Handle Unicode chars with AlreadyRunningError exception
Changed AlreadyRunningError to be able to throw unicode error message, in case of accented characters resulted from language translation
EDUCATOR-1730
2017-12-05 18:13:25 +05:00
Ari Rizzitano
f39833c709 expand proctored exam report to include violation summary
EDUCATOR-411

hit new report endpoint
EDUCATOR-411

bad syntax

python join != js join

csv headings list too long for task

fix string formatting

fix wrong set of keys

bump edx-proctoring to 1.2.0
2017-08-23 11:10:13 -04:00
cahrens
b26b41b9fc Replace deprecated_string methods. 2017-08-15 14:21:45 -04:00
cahrens
819a56fee3 Remove usages of deprecated SlashSeparatedCourseKey. 2017-08-14 11:01:00 -04:00
noraiz-anwar
d1da044520 Throw error if messaging queue is not available 2017-08-03 14:11:25 +05:00
sanfordstudent
07ad189b9d Merge pull request #15263 from edx/sstudent/grade-override
Learner grade override
2017-07-18 14:33:27 -04:00
Sanford Student
932776159c EDUCATOR-165 instructor task and UI for overriding learner grades. 2017-07-18 13:51:56 -04:00
Albert St. Aubin
b8b0110d15 Ui updates, Error messaging shown when discussion scheme is not selected 2017-07-12 12:49:54 -04:00
Andy Armstrong
a815003b3b Handle anonymous and unenrolled users on the new course home page
LEARNER-1696
2017-07-10 17:52:28 -04:00
Albert St. Aubin
6cdcf8e9b8 Discussion group moderation 2017-07-06 13:39:03 -04:00
Andy Armstrong
79acb5c5be Reorder LMS imports using isort 2017-06-11 21:48:06 -04:00
sanfordstudent
3278fcf1d6 Merge pull request #15045 from edx/neem/handle_unrescorable
400 for non-rescorable blocks
2017-05-16 10:36:33 -04:00
Sanford Student
8cfff9a883 400 for non-rescorable blocks 2017-05-16 09:45:37 -04:00
rabiaiftikhar
ffa9b7efe3 EDUCATOR-217-364 add logs in bulk email 2017-05-15 09:50:58 +00:00
attiyaishaque
4316731f70 TNL-4412 user is not enrolled as a beta tester when account is unactivated. 2017-04-26 10:54:15 +05:00
Asad Azam
9ae3a3210b Added logs for adding/removing students from whitelist 2017-03-17 17:48:19 +05:00
Douglas Hall
06fa13f4df Allow for customization of course email template at the organization level 2017-02-06 14:23:58 -05:00
Sanford Student
5fd94a6698 add verfication status and enrollment mode to user profile report
for TNL-6214
2016-12-29 16:44:41 -05:00
Qubad786
65ef041a53 Add ability to generate certs for audit_passing/audit_notpassing learners 2016-10-21 16:03:29 +05:00
Mushtaq Ali
dacfcc985f Generate certificates for verified users with audit certificate statues - ECOM-5012 2016-10-21 16:03:28 +05:00
Nimisha Asthagiri
aa000c1a3d Support for rescoring a problem only if the new score is higher
TNL-5046
2016-10-20 15:08:54 -04:00
Sanford Student
54d34e834d update all references to instructor module 2016-10-12 11:35:02 -04:00
Sanford Student
79eaa4e2e9 update all references to instructor module 2016-10-12 10:04:32 -04:00
Mushtaq Ali
fb2f9948e1 Fix dynamic load RequireJs issue on Maintenance Dashboard 2016-08-09 13:48:20 +00:00
Mushtaq Ali
abb6af9789 Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46 2016-08-09 18:16:13 +05:00
Adam Palay
6c743c543a fix failing test by updating require_global_staff decorator 2016-08-01 11:49:51 -04:00
Adam Palay
feb042d474 Revert "Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46"
This reverts commit 27646b7e6f.
2016-08-01 10:13:10 -04:00
Saleem Latif
8ae92901ef 1. Merge microsites into Comprehensive Theming
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
2016-07-27 13:55:14 +05:00
Mushtaq Ali
27646b7e6f Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46 2016-07-22 18:29:12 +00:00
Ibrahim
603546a04a replace references to settings.PLATFORM_NAME in edx-platform with theme overrides 2016-06-17 18:33:19 +05:00
Robert Raposa
84726d6e1b Merge pull request #12723 from edx/release
Merge hotfix-2016-06-10 release into master
2016-06-10 16:01:23 -04:00
Robert Raposa
d54f79f5bf Switch dashboard from GET to POST. 2016-06-10 13:14:19 -04:00
Eric Fischer
faa7f544d2 Bulk Email Cohorts (#12602)
Adds cohorts as valid bulk email targets.
2016-06-06 16:32:59 -04:00
Douglas Hall
ea654200f5 Put shopping cart bulk purchase behind a settings flag 2016-06-03 14:41:32 -04:00
Eric Fischer
a9a3fabfe8 Bulk Email Multiselect (#12301)
TNL-4356

Allows multiple bulk email targets to be specified at once.

-The previous "All" option has been split into "Staff" and "Learners"
-The backend changes made here lay the groundwork for cohort emailing
-The data migration, 0005, is somewhat large and requires deploy attention
-Tests have been updated
-Numerous safe-commit-linter fixes are included
2016-05-26 14:22:04 -04:00
Asad Iqbal
18cddf6e1e Merge pull request #12488 from edx/asadiqbal08/WL-477
Got two thumbs up, so merging. 
WL-477 Route direct references to email address configurations through theming.helpers
2016-05-23 17:56:28 +05:00
asadiqbal
1c19ebb443 WL-477 2016-05-23 13:24:05 +05:00
Ned Batchelder
9351b302b5 Merge pull request #12492 from edx/ned/fix-csv-headers
Ensure correct CSV headers for non-English
2016-05-19 11:26:38 -04:00
Ned Batchelder
17b16b115d Ensure correct CSV headers for non-English
If we pass non-ASCII strings to create_csv_response, it will call
unicode() on it, and fail with UnicodeDecodeError.  So pass Unicode
strings, or ASCII-only bytestrings for the headers.
2016-05-18 11:10:32 -04:00
cahrens
cafc15cf7d Move city and country fields to the very end.
OSPR-1155
2016-05-17 15:41:28 -04:00
Eric Fischer
0cf3e39c31 Replace bulk email settings with admin config models
Moves ENABLE_INSTRUCTOR_EMAIL and REQUIRE_COURSE_EMAIL_AUTH from settings files
to admin-accessible configuration models. This allows for the bulk email settings
to be modified without a new AMI deploy. See TNL-4504.

Also updates tests:
    -python tests mock out the new configurations in place of the old settings
    -lettuce test has been moved to bokchoy
        (note that there was some loss of coverage here - the lettuce tests had
        been doing some voodoo to allow for cross-process inspection of emails
        messages being "sent" by the server, from the client! In discussion with
        testeng, this seems outside the realm of a visual acceptance test. So,
        the bokchoy test simply confirm the successful queueing of the message,
        and leaves the validation of sending messages to the relevant unit tests.)
    -bok choy fixture has been added, to replace the settings in acceptance.py
    -lettuce and bok choy databases have been updated to reflect the backend changes

The new default is to have bulk_email disabled, we'll need to call this out in the
next OpenEdx release to ensure administrators enable this feature if needed.
2016-05-16 11:09:39 -04:00
Régis Behmo
fe41e50d74 Include non-obsolete location info in student profile report
The student profile report that can be downloaded from the course staff
dashboard included the "location" field (which is obsolete) and the
mailing address, which is seldom completed. Here, we add the "country"
and "city" fields to the csv report. To do so, we need to be able to
dump the new fields to JSON so we convert the user fields to unicode
when needed.

Note that this breaks compatibility with earlier reports.
2016-05-10 18:25:15 +02:00
Syed Hassan Raza
76057fc4d2 semantic task_input for certificate generation ECOM-3505 2016-04-07 09:06:36 -04:00
Eric Fischer
25e67370cd Unbound xblock method requires user id
clear_student_state(), a method defined by ORA, requires information
about the user making the request. Since this xblock is not bound,
we must provide that information explicitly.
2016-03-10 11:13:02 -05:00
dylanrhodes
2b1a7eece2 Asynchronous download button for ORA2 data
Conflicts:
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/utils.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/api_urls.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor_task/api.py
	lms/djangoapps/instructor_task/tasks.py
	lms/djangoapps/instructor_task/tasks_helper.py
	lms/djangoapps/instructor_task/tests/test_api.py
	lms/djangoapps/instructor_task/tests/test_tasks.py
	lms/djangoapps/instructor_task/tests/test_tasks_helper.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/coffee/src/instructor_dashboard/data_download.coffee
	lms/templates/instructor/instructor_dashboard_2/data_download.html
2016-03-10 09:58:55 -05:00
Awais Jibran
0f2f1f2c17 Add logging when user is removed from exception list
ECOM-3525
2016-01-27 14:48:29 +05:00
Peter Fogg
96cc38951d Disable audit certificates for new audit enrollments.
Two new certificate statuses are introduced, 'audit_passing' and
'audit_notpassing'. These signal that the GeneratedCertificate is not
to be displayed as a cert to the user, and that they either passed or
did not. This allows us to retain existing grading logic, as well as
maintaining correctness in analytics and reporting.

Ineligible certificates are hidden by using the
`eligible_certificates` manager on GeneratedCertificate. Some places
in the coe (largely reporting, analytics, and management commands) use
the default `objects` manager, since they need access to all
certificates.

ECOM-3040
ECOM-3515
2016-01-22 10:27:55 -05:00
Peter Fogg
52d538444e Revert "Disable audit certificates for new audit enrollments."
This reverts commit 60860e3aa8.
2016-01-20 09:53:58 -05:00
Matt Drayer
c9933a5878 Merge pull request #11209 from edx/saleem-latif/MAYN-167
MAYN-167: Bulk uploads (CSV) of manual enrollments on white labels should be performed as 'honor' modes
2016-01-15 11:07:50 -05:00