Commit Graph

868 Commits

Author SHA1 Message Date
Nimisha Asthagiri
74a3665289 Update query and mongo counts 2016-06-23 20:22:32 -04:00
Nimisha Asthagiri
02e6925275 Update grades to use Block Structures 2016-06-23 20:22:31 -04: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
Chris Rodriguez
257903fe15 AC-414 adding headings as first child to sections 2016-06-10 12:30:03 -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
Afzal Wali
eadd656df0 SOL-1802 Allow proctoring service to create support ticket. 2016-05-27 09:29:06 -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
Robert Raposa
ebf89d63e9 Merge pull request #12541 from edx/robrap/fix-imports
Fix import order for HTML, Text.
2016-05-25 15:23:08 -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
Robert Raposa
7223ee9316 Fix import order for HTML, Text. 2016-05-23 08:47:08 -04: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
Calen Pennington
853bfe7a36 Add a TestCase mixin for enabling caches in tests
By default, disable all caching in tests, to preserve test independence.
In order to enable caching, inherit from CacheSetupMixin, and specify
which cache configuration is needed.

[EV-32]
2016-05-04 14:51:30 -04:00
cahrens
f0f7cf4d33 Clean up HTML encoding. 2016-05-03 12:32:48 -04:00
cahrens
9b28afb7bd Add messaging when verified track content MVP is enabled.
TNL-4393
2016-05-02 14:25:25 -04:00
Ben Patterson
b9558a90f1 Create a 3rd explicit shard for unit tests.
More accurately, this creates a 4th shard because the
last shard is always the default.
2016-04-28 10:09:32 -04:00
John Eskew
0899871958 Merge pull request #11042 from edx/jeskew/xml_removal
Remove XML modulestore code from most tests.
2016-04-27 11:20:02 -04:00
Waheed Ahmed
f246c6bbd6 Automatically enable Self Generating Certificates for Self Paced Courses.
ECOM-3437
2016-04-25 17:52:47 +05:00
Omar Khan
6fc4b38ea0 Disallow free verified course modes
The verification workflow assumes that all verified courses will have a
price. Free verified course modes cause a 404 when the user attempts to
enroll or upgrade.
2016-04-12 18:06:16 -07:00
John Eskew
8a9845c26e Remove ModuleStoreEnum.Type.xml 2016-04-12 11:53:51 -04:00
John Eskew
91c94977d5 Unify usage of a single test mixed modulestore called:
TEST_DATA_MIXED_MODULESTORE
Remove these test mixed modulestores:
TEST_DATA_MIXED_TOY_MODULESTORE
TEST_DATA_MIXED_CLOSED_MODULESTORE
TEST_DATA_MIXED_GRADED_MODULESTORE
2016-04-12 11:53:51 -04:00
Ned Batchelder
2e1238b83e Remove unused imports 2016-04-08 11:23:05 -04:00
Adam Palay
76f0fb0fc2 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-04-07 12:02:43 -04:00
Syed Hassan Raza
76057fc4d2 semantic task_input for certificate generation ECOM-3505 2016-04-07 09:06:36 -04:00
Ben Patterson
c9e4a1d964 Revert "Disallow free verified course modes" 2016-04-06 13:58:41 -04:00
Simon Chen
e0995b8072 Merge pull request #11374 from open-craft/omar/verified-coursemode-price
Disallow free verified course modes
2016-04-06 12:32:00 -04:00
John Eskew
7e9a139d03 Merge pull request #11766 from CredoReference/too-many-mongo-queries-in-instructor-api-gradebook
Reduce the number of queries to mongodb in /courses/<course-id>/instructor/api/gradebook API
2016-03-29 10:27:02 -04:00
Dennis Jen
3ff09dee9a Added safe templating to instructor_analytics.html. 2016-03-24 09:45:57 -04:00
Dmitry Viskov
d750238410 Reduce the number of queries to mongodb in /courses/<course-id>/instructor/api/gradebook API 2016-03-20 03:42:31 +03:00
Muddasser
79c5a792e8 Removed duplicate lettuce test from data_download.feature 2016-03-17 14:39:40 +05: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
cahrens
ba06c899de Delete crowdsource_hinter prototype xmodule.
TNL-4195
2016-03-04 15:34:48 -05:00
cahrens
3a06534241 Remove unused profile name.
The profile name requires escaping when displayed. Proactively removing since it is not being used.
2016-03-02 11:49:33 -05:00
Omar Khan
0b4fa6e5a5 Disallow free verified course modes
The verification workflow assumes that all verified courses will have a
price. Free verified course modes cause a 404 when the user attempts to
enroll or upgrade.
2016-02-03 21:19:45 +07:00
Awais Jibran
7d8936e328 Merge pull request #11346 from edx/aj/ecom-3525-add-logging-in-remove-user-from-cert-exception
Add logging when user is removed from exception list
2016-01-28 13:56:52 +05:00
Giovanni Di Milia
e63194c1cd Added CCX REST APIs
CCX REST APIs
OAUTH2 authorization for CCX APIs
- oauth2 authorization required for ccx list.
- Course-instructor permission for ccx api endpoint
- Protection for detail view too.

Tests for CCX REST APIs and OAUTH2 authorization
2016-01-27 11:04:28 -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
6cd12f9f39 Merge pull request #11296 from edx/peter-fogg/fix-certs-migrations
[wip] Reintroduce generated certificate changes, with updates to not require a giant migration.
2016-01-22 11:19:54 -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
Awais Jibran
8a6699a46d Studio breaks DEFAULT_COURSE_ABOUT_IMAGE_URL is not set in settings in cms
ECOM-3384
2016-01-22 16:49:57 +05:00
Adam
c6b21d139a Merge pull request #11293 from edx/release
Release
2016-01-21 12:36:03 -05:00
Ned Batchelder
fe2e4a7481 Merge pull request #11273 from openfun/fun/fix_default_email_localization
Fix (un)enrollment email default language
2016-01-20 13:15:30 -05:00