Commit Graph

384 Commits

Author SHA1 Message Date
Don Mitchell
3885e6cf78 Merge branch 'release'
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
2014-01-16 12:51:22 -05:00
Don Mitchell
7ff137866b Merge pull request #2180 from edx/usman/openended_post_hostname_argument
Added hostname argument to openended_post command.
2014-01-15 09:05:32 -08:00
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones
STUD-1006
2014-01-14 17:04:44 -05:00
Don Mitchell
858e354a6d Moved roles.py to common student 2014-01-14 17:04:43 -05:00
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
2014-01-14 14:36:01 -05:00
Chris Rossi
831f907c79 Add individual due dates feature.
Adds a feature to the edX platform which allows instructors to set
individual due dates for students on particular coursework. This code is
meant primarily for on-campus use--it is not intended that this feature
would be used for MOOCs. It adds a new tab, "Extensions", to the beta
instructor dashboard which allows changing due dates per student. This
feature is enabled by setting FEATURES['INDIVIDUAL_DUE_DATES'] = True.
2014-01-14 10:19:02 -05:00
Usman Khalid
45401f5a73 Added hostname argument to openended_post command.
ORA-286
2014-01-10 11:44:20 -05:00
Usman Khalid
57710d7226 Added django commands to get statistics and repost submissions to grader for open ended problems.
ORA-286
2014-01-06 19:13:28 +05:00
Adam Palay
b923521a47 corrects typo in legacy.py (LMS-1675) 2013-12-23 09:43:57 -05:00
David Ormsbee
0565fbbfab Fix (re-implement) answer distribution report generation.
This restores functionality that has been broken since the introduction of
XModuleDescriptor/XModule proxying (part of the XBlock transition). It generates
a CSV of all answers for all content of type "problem" in a given course, with a
row per (problem part, answer). The format is:

url_name, display name, answer id, answer, count

Example values:
  url_name = "7f1b1523a55848cd9f5c93eb8cbabcf7"
  display name = "Problem 1: Something Hard"
  answer id = i4x-JediAcdmy-LTSB304-problem-7f1b1523a55848cd9f5c93eb8cbabcf7_2_1
  answer = "Use the Force"
  count = 1138

Since it only grabs things of type "problem", it will not return results for
things like self/peer-assessments. Any Loncapa problem types will show up (so
multiple choice, text input, numeric, etc.)

Instead of crawling the course tree and instantiating the appropriate CapaModule
objects to grab state, this version draws directly from StudentModule. This lets
us skip a lot of processing and most importantly lets us generate the answer
distribution without causing side-effects (since XBlocks auto-save state). It
also lets us take advantage of a read-replica database if one is available, to
minimize locking concerns.

There are minor changes to the legacy dashboard around CSV charset encoding and
a change to OptionResponseXMLFactory to make it more unicode friendly. Answer
distribution output is now also sorted, to group together answers for the same
content piece.

Note that this does not introduce celery into the process. Answer distributions
are still only available for small courses.

This was originally created to fix [LMS-922], but it also addresses [LMS-811] and
possibly other areas in the legacy dashboard where CSV downloads break due to
character encoding issues.
2013-12-20 15:05:50 -05:00
Sarina Canelake
b2fee69c08 Fix acceptance test to wait for text area to be populated 2013-12-13 13:13:21 -05:00
David Baumgold
cc31b5cce6 Fix another unbound underscore 2013-12-11 14:38:36 -05:00
cahrens
249aa8ef23 Fix missing _ import.
Fallout from #1792.
2013-12-11 14:33:18 -05:00
cahrens
0b161998a1 Revert "Fix missing _ import."
This reverts commit 82d7da8253.
2013-12-11 14:30:02 -05:00
cahrens
82d7da8253 Fix missing _ import.
Fallout from #1792.
2013-12-11 14:29:22 -05:00
Sarina Canelake
b406ba0f83 Acceptance tests for grades download
Refactor instructor dash acceptance tests.
Add additional acceptance tests for buttons on 'Data Download' tab.

LMS-58
2013-12-09 18:28:41 -05:00
Sarina Canelake
c547ac7286 Fix bulk email acceptance test 2013-12-09 18:28:41 -05:00
David Baumgold
b784979976 Merge pull request #1792 from edx/man2life-i18n-no-forums
i18n (no forums)
2013-12-09 11:28:18 -08:00
Adam Palay
11b635c00b import GlobalStaff to legacy.py (LMS-1599) 2013-12-06 12:49:51 -05:00
David Baumgold
03d7d0e952 more i18n work 2013-12-05 14:03:02 -05:00
Sarina Canelake
2c2c238269 Merge pull request #1817 from edx/sarina/lms-197
Encode header row (LMS-197)
2013-12-05 07:20:02 -08:00
Sarina Canelake
0426e51d06 Encode header row (LMS-197) 2013-12-03 18:10:13 -05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
David Ormsbee
a99fd08004 Fix error case where we have items in our grading csv output
that are not present in a given student's gradeset.

General code cleanup and addition of comments.

Instructor dashboard API unit tests.

LMS-58
2013-11-22 10:06:28 -05:00
Sarina Canelake
e2423386cb UX for Data Download tab on instructor dash
Restrict grade report generation to 'is_superuser' users (can be overridden with
feature flag ALLOW_COURSE_STAFF_GRADE_DOWNLOADS); all staff users can download
generated files.

LMS-58
2013-11-22 10:06:22 -05:00
David Ormsbee
e0aa8cf78a Grade report celery task and direct file push to S3 from the new instructor dashboard.
Hook up display of grade files ready for download to new instructor dashboard.

LMS-58
2013-11-22 10:06:10 -05:00
David Adams
ed980f2189 Port of invitation/enroll/unenroll email functionality
into beta dashboard.

Also includes new functionality, in both legacy and beta
dashboard, to include appropriate email text for a
Shibboleth course.
2013-11-15 10:10:04 -08:00
Calen Pennington
061a46beef Formalize various access roles as objects
This centralizes the logic for group membership, and means that we
don't need to make queries to find out whether the legacy groups names exist.
2013-11-13 13:42:37 -05:00
Adam
3dfdab1a23 Merge pull request #1629 from edx/adam/fix/enrollment-count-intr-dash
makes beta dash count active users in enrollment count [AN-115]
2013-11-12 05:58:23 -08:00
Adam Palay
4d1eebc557 fixes Edit Course In Studio link on instr dash (LMS-1455)
add DOC_STORE_CONFIG to test settings
2013-11-08 15:42:51 -05:00
Adam Palay
71b70bce61 makes beta dash count active users in enrollment count [AN-115] 2013-11-08 14:11:59 -05:00
Calen Pennington
864d831ce3 Use XBlock handlers for handle_ajax in XModules
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.

[LMS-230] [LMS-229]
2013-11-08 11:08:48 -05:00
Sarina Canelake
ea529b8841 Fix instructor api tests 2013-11-05 09:26:32 -05:00
Sarina Canelake
eb0e09d63f Clean up some instructor dash code 2013-11-04 11:38:43 -05:00
Will Daly
9ab35759be Added wait for problem to re-render when checking or resetting it
Added wait for JS on upload page
Fixed an issue where css_click wasn't waiting for JS to load
2013-11-01 14:31:37 -04:00
Sarina Canelake
fff36275db Implement background email tasks on student dash
LMS-1244
2013-11-01 09:20:34 -04:00
Sarina Canelake
b86e912905 Make event handlers fire properly
Respond to review comments

LMS-1242
2013-10-30 13:43:39 -04:00
Sarina Canelake
57a57e8af7 Move PIT code into util.coffee
Add testing coverage
LMS-1242

Add "Edit This Course In Studio" link for studio courses
LMS-1291
2013-10-30 13:43:39 -04:00
Sarina Canelake
123e18109d Reorganize Course Info dash section
LMS-1242
2013-10-30 13:43:39 -04:00
Sarina Canelake
9330ef65a8 Enable Pending Tasks section on new dash
Add Pending Tasks section to the following tabs:
* Course Info
* Student Email
* Data Download
* Email

LMS-1242
2013-10-30 13:43:39 -04:00
Sarina Canelake
9cea6ab599 Copy changes to Inst Dash email 2013-10-30 10:03:29 -04:00
Calen Pennington
10ee2dea82 Clean up imports 2013-10-29 10:36:22 -04:00
Calen Pennington
12cc4a19c0 Merge pull request #1224 from cpennington/lms-xblock-js-execution
Add an XBlock javascript runtime, and use it to run XModules
2013-10-21 05:53:36 -07:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules
[LMS-57]
2013-10-18 16:31:32 -04:00
Brian Wilson
aa172272f3 Update master with hotfixes from release-2013-10-17. 2013-10-18 11:50:42 -04:00
Sarina Canelake
b3faf5c476 Merge pull request #1390 from edx/sarina/disable-student-email-settings-with-auth
Student Dash: Disable "Email Settings" when course isn't authorized
2013-10-17 12:17:58 -07:00
Sarina Canelake
9fb1d9ecf2 Remove 'Email Settings' link on student dashboard for unauth courses 2013-10-17 15:10:47 -04:00
Sarina Canelake
582e21b92d Course Auth tests for legacy dash 2013-10-17 13:49:42 -04:00
Sarina Canelake
951837f7c9 Catch email exceptions on the legacy dash 2013-10-17 13:39:13 -04:00