Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,562 Commits 1 Branch 0 Tags
e96108629dbd545be20f58bcf7ffce71c9c68f03
Commit Graph

19562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Александр
e96108629d Fix LTI tests. 2013-12-04 15:55:47 -05:00
Александр
c4515faedf Make has_score to be XField insted of decriptor property. 
Conflicts:
	common/lib/xmodule/xmodule/lti_module.py
 2013-12-04 15:55:42 -05:00
polesye
e4403815e7 Fix LTI max_score method. 2013-12-04 15:54:51 -05:00
Ned Batchelder
c7ac4100ff Merge pull request #1840 from edx/adam/db-error 
Fixes to database columns
 2013-12-04 12:07:07 -08:00
Ned Batchelder
19c6b8564d Merge pull request #1842 from edx/hotfix/error-msg-ORA-panel 
adds more temporary error messages
 2013-12-04 11:34:07 -08:00
Adam Palay
175e1aab9e adds more temporary error messages 2013-12-04 14:30:09 -05:00
Ned Batchelder
83c6a72051 Merge pull request #1841 from edx/hotfix/error-msg-ORA-panel 
Hotfix/error msg ora panel
 2013-12-04 11:12:55 -08:00
Adam Palay
eb23b65992 add temporary error message for ORA panel 2013-12-04 14:10:47 -05:00
Calen Pennington
838622f5bd Handle integrity errors when creating/retrieving AnonymousUserId entries 2013-12-04 13:56:53 -05:00
Adam Palay
7171397d95 extend max_length of anonymous_user_id (LMS-1571) 2013-12-04 13:56:53 -05:00
Ned Batchelder
ddb2483367 Update the XBlock version. 2013-12-02 15:48:05 -05:00
Ned Batchelder
6dac4b79d3 Merge pull request #1791 from cpennington/rebased-lti-graded 
BLD-384: Add grading to LTI module
 2013-11-26 14:07:55 -08:00
Calen Pennington
11bbf4c182 Add grading functionality to LTI xmodule 
Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
[BLD-384]
 2013-11-26 16:30:55 -05:00
Calen Pennington
52ab2b1313 Make FieldDataCache use the user from scope_ids, rather than its pre-configured user 
Co-author: Ned Batchelder <ned@edx.org>
 2013-11-26 16:29:35 -05:00
Calen Pennington
1205173d6f Add a per-course anonymous student id 
This does not yet replace the existing per-student anonymous id, but
is intended to do so in the future.

Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
 2013-11-26 16:29:35 -05:00
Calen Pennington
9b6edea406 Rename the LTIModuleDescriptor to LTIDescriptor to follow convention 2013-11-26 16:29:34 -05:00
Calen Pennington
6d613f9d4e Enable un-authenticated handler urls 
Updates to depend on the latest version of XBlock, which includes
support for service-to-service (thirdparty) handler urls, which aren't
authenticated with a user (unlike handler requests coming from the
xblock client-side javascript).

Co-author: Ned Batchelder <ned@edx.org>
 2013-11-26 16:29:34 -05:00
Calen Pennington
329419696e Merge pull request #1746 from cpennington/fix-lms-1532 
Fix LMS-1532 (partially instantiated XModules after an exception)
 2013-11-22 10:01:43 -08:00
Calen Pennington
e968c0c0fa Merge pull request #1743 from cpennington/fix-beta-tester-roles 
Fix for [LMS-1528], plus Changelog entry for the related feature
 2013-11-22 10:01:32 -08:00
Adam Palay
24aa0decb4 fix OrgInstructorRole definition and add tests 2013-11-22 13:00:45 -05:00
Calen Pennington
c0f570ceab Fix [LMS-1528] (500 error when checking for beta access) 2013-11-22 13:00:45 -05:00
Calen Pennington
820e771171 Add failing test for [LMS-1528] 
Also cleans up test_view_authentication to use user factories for
various user classes
 2013-11-22 13:00:45 -05:00
Calen Pennington
0c2c68117d Add release notes for 061a46beef, concerning change to beta-tester groups 2013-11-22 13:00:45 -05:00
David Ormsbee
87f19469b9 Merge pull request #1750 from edx/sarina/dormsbee_grades_download 
Sarina/dormsbee grades download
 2013-11-22 09:28:09 -08:00
Calen Pennington
3c042b52fd Clear out the cache xmodule_instance after an exception in XModule init 
This guarantees that the ErrorModule will be created, instead of
potentially using a partially instatiated broken module. Fixes
[LMS-1532].
 2013-11-22 12:08:29 -05:00
Calen Pennington
8d62fa14d8 Tests for LMS-1532 2013-11-22 12:08:29 -05:00
Adam Palay
cf524906e0 more granular transactions in grading [LMS-1480] 
remove field_data_cache from grades.grade and grades.progress_summary

cleans grading code by adding wrappers
 2013-11-22 12:02:35 -05:00
Ned Batchelder
3efcc3d6ef Merge pull request #1753 from edx/ned/pr-1745-lms-1492 
Ned/pr 1745 lms 1492
 2013-11-22 08:50:08 -08:00
Ned Batchelder
75532987ce Properly convert files from Webob to pure files. 
Webob represents uploaded files as cgi.FieldStorage objects.  The
XModule code expects pure Python file objects.  Each FieldStorage object
is wrapped to present the proper file interface, with file names.

LMS-1492
 2013-11-22 11:47:34 -05:00
Ned Batchelder
1c27ec3d7e Add two tests of problems-with-files 
One test passes already, the other fails.  Fix in next commit.
 2013-11-22 11:47:33 -05:00
Ned Batchelder
6d94b71203 Clean up test files, no substantive changes. 
These changes prepare for the changes to the tests that are coming, but
make no change to the behavior themselves.
 2013-11-22 11:47:33 -05:00
David Ormsbee
901ad22652 Make ENABLE_S3_GRADE_DOWNLOADS disabled by default, enabled in dev. 
Having ENABLE_S3_GRADE_DOWNLOADS enabled by default in common.py
could lead to surprising behavior for folks downstream. They'd
suddenly see a grade download screen on their new instructor
dashboard, but the links by default would be local files and
couldn't be used in an actual production environment. So we disable
by default and let people explicitly enable it and set it up for
S3 if they wish.

LMS-58
 2013-11-22 10:06:34 -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
Ned Batchelder
8d01a36e54 Merge pull request #1742 from edx/ned/cherry-pick-pr-1740 
Ned/cherry pick pr 1740
 2013-11-21 07:44:57 -08:00
Don Mitchell
3ab17d7523 Allow colons in Locator fields. 2013-11-21 10:41:49 -05:00
Calen Pennington
fdf7ea2cc0 Merge pull request #1726 from cpennington/hotfix-fix-OEE-ajax-url 
Fix LMS-1493
 2013-11-20 13:20:45 -08:00
Calen Pennington
b4a1840344 Move xmodule_runtime.xmodule_instance registration earlier 
This allows XModules (specifically CombinedOpenEnded) to use ajax_url
during their init functions (which would, before, have thrown an
exception).

[LMS-1493]
 2013-11-20 10:15:09 -05:00
Calen Pennington
6c9ad30ee1 Update open-ended tests to load the module between 'requests' 
Under normal operation, XModules are reloaded on each request from a
student. CombinedOpenEnded modules have code that runs at initialization
that validates the students state. These changes makes that code run
during several long-form unit tests (testing CombinedOpenEnded across
multiple 'requests').

These tests are marked as expectedFailure because they now exhibit the
same failures as observed in [LMS-1493] (namely, the students state gets
reset, because CombinedOpenEnded interprets system.ajax_url raising an
error as meaning that the problem definition and the student answers are
in conflict)
 2013-11-20 10:15:09 -05:00
John Jarvis
7a24f2036c Merge pull request #1718 from edx/jarv/fix-static-url 
'ignore' shouldn't be use for ascii conversion
 2013-11-19 11:38:28 -08:00
John Jarvis
693cfdea50 'ignore' shouldn't be use for ascii conversion 
The input string is not expected to contain any unicode characters
 2013-11-19 14:34:06 -05:00
Giulio Gratta
745f45090f Merge pull request #1702 from edx/giulio/anon-user-id-yml 
Adding a YAML file to demonstrate how to include anonymized user IDs in Studio elements.
 2013-11-19 11:29:26 -08:00
Christina Roberts
d4082859f8 Merge pull request #1714 from edx/christina/fix-children 
The forcing of IDs to non-draft must happen in base.py instead of draft....
 2013-11-19 11:18:54 -08:00
John Jarvis
9206f33f30 Merge pull request #1713 from edx/jarv/fix-static-url 
fixes issue where STATIC_URL was overwritten without git.revision
 2013-11-19 10:50:11 -08:00
cahrens
705ccd01bc An empty category will result in InvalidLocationErrors. 2013-11-19 13:41:44 -05:00
John Jarvis
4067a084ee STATIC_URL_BASE for lms config 2013-11-19 13:23:54 -05:00
John Jarvis
71184220e6 convert STATIC_URL to ascii 2013-11-19 12:25:59 -05:00
cahrens
ed9a61e2d9 The forcing of IDs to non-draft must happen in base.py instead of draft.py. 
The draft.py solution only worked when the parent was also in the draft store.
 2013-11-19 12:08:29 -05:00
John Jarvis
0e6b21ef71 adding slash 2013-11-19 11:40:31 -05:00