Commit Graph

5319 Commits

Author SHA1 Message Date
Ned Batchelder
27b8c83b34 Mark XModule strings for i18n 2014-01-07 09:43:46 -05:00
Ned Batchelder
549d9230f8 Merge pull request #2077 from edx/ned/misc-msg-fixes
Miscellaneous fixes to strings found during i18n work.
2014-01-07 06:41:42 -08:00
zubair-arbi
f71688ce42 Merge pull request #2075 from zubair-arbi/zub/bugfix/std878-wrongcontenttype
Assign valid content_type to static resource (import_static_content)
2014-01-06 23:35:44 -08:00
Usman Khalid
6108529ce1 Merge pull request #2001 from edx/waheed/openended-problems-commands-2
Django command to post submissions to ora
2014-01-06 08:04:33 -08:00
Ned Batchelder
93682af4eb Don't catch all exceptions. 2014-01-06 10:24:00 -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
zubiar-arbi
b998a161d2 Assign valid content_type to static resource (import_static_content)
STUD-878
2014-01-06 14:05:09 +05:00
Andy Armstrong
f9c45586a4 Add pagination to Studio's Files and Uploads page
These changes implement STUD-813. The commit consists of the
following logical changes:
 - a REST API has been implemented for a course's assets
 - the page itself now fetches the assets client-side
 - the Backbone.Paginator library is used to support pagination
 - the AssetCollection has been refactored to extend
   Backbone.Paginator.requestPager so that it can be paged
 - an abstract PagingView class has been added to generalize
   the communication with a paging REST API
 - the AssetsView has been reimplemented to extend PagingView
 - two new child views have been added:
   - PagingHeader: the paging controls above the list of assets
   - PagingFooter: the paging controls below the assets
2014-01-05 23:35:12 -05:00
Ned Batchelder
be6c57f53a Mark XModule strings for i18n 2014-01-03 17:50:16 -05:00
Ned Batchelder
39380f2d22 Very Minor tweaks to the LMS and CMS startup.
I was going to do something in the startup code, then changed my mind,
but didn't want to just discard these changes.
2014-01-02 14:27:52 -05:00
polesye
65f903a325 Disable tests due to flakiness. 2013-12-30 18:07:40 +02:00
Christina Roberts
ad6e4f2c64 Merge pull request #2020 from edx/christina/export-bug2
Support non-ascii chars as arguments to format.
2013-12-27 08:35:55 -08:00
Christina Roberts
719a898e0f Merge pull request #2018 from edx/christina/export-bug
Bug fixes related to unicode support in export workflow.
2013-12-27 08:34:49 -08:00
Oleg Marshev
7c070f29a1 Add better messaging, turn off SSL verification when sending grade back. 2013-12-27 09:59:21 +02:00
polesye
934b5198c3 Address comments. 2013-12-24 14:59:21 +02:00
polesye
afec2dd4ad Add tests for Android. 2013-12-24 14:59:21 +02:00
polesye
b6808d3d13 BLD-541: Fix video controls on iPad. 2013-12-24 14:59:20 +02:00
Don Mitchell
f5f24fcc12 Merge pull request #2022 from edx/dhm/locator_course_id
Change course_id to package_id
2013-12-23 11:15:48 -08:00
Don Mitchell
b7368ef69a Change course_id to package_id
on new Locators to make it clear that they have a different syntax
than Location.course_id altho they represent the same info.
2013-12-20 16:16:50 -05:00
David Ormsbee
b1eff059a7 Merge pull request #2014 from edx/ormsbee/grade_distribution_fix
Fix (re-implement) answer distribution report generation.
2013-12-20 12:43:33 -08: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
cahrens
367ea683bd Support non-ascii chars as arguments to format.
We've had errors in export related to non-ascii chars being passed to format. Proactively making these usages of format robut to non-ascii chars.

Part of STUD-868
2013-12-20 14:55:07 -05:00
Calen Pennington
aa57481ecc Add handler_url usable by descriptors
[LMS-1614]
2013-12-20 14:05:53 -05:00
Calen Pennington
3bb67a8b0e Merge pull request #1996 from cpennington/conditional-module-acceptance-tests
Add acceptance tests of the conditional module
2013-12-20 11:01:07 -08:00
cahrens
dc3b5ab57a Support unicode in text field.
Part of STUD-868
2013-12-20 13:31:16 -05:00
cahrens
df5b22e545 Fix exception to support unicode (and print url_name).
Part of STUD-868
2013-12-20 12:52:08 -05:00
Calen Pennington
06fadcdc0c Make conditional module and poll modules a little easier to understand 2013-12-20 12:32:15 -05:00
Don Mitchell
6c4aae731a Merge pull request #1980 from edx/dhm/locator_block_id
Rename BlockUsageLocator's block_id field from usage_id
2013-12-20 08:52:46 -08:00
jmclaus
5478525a42 Added JSInput template to Studio and a sop attribute to JSInput. Only if it's set to false, as in JSInput's template, will JSChannel be used to bypass it. In all other cases (attribute not present or set to something else), SOP is enforced. Compatibility with jsVGL is therefore maintained. Multiple JSInput are supported in a vertical. Also, save button now functions. [BLD-523, BLD-556, BLD-568] 2013-12-20 17:03:56 +01:00
Don Mitchell
a46e112a04 Improve test coverage
and fix found errors.
2013-12-20 10:44:01 -05:00
Ned Batchelder
c0c895cb47 Merge pull request #1886 from edx/ned/add-tests-for-file-uploads
Add a test for Django-based file uploads to problems.
2013-12-20 07:06:04 -08:00
Valera Rozuvan
1542a74d2b Removed logme module. Using console.log() instead.
Removing "logme" from comments.

BLD-608
2013-12-20 16:25:44 +02:00
polesye
042cb5c698 BLD-206: Add template for the zooming image in Studio. 2013-12-19 21:47:32 +02:00
Will Daly
1081786c6f Merge pull request #1965 from edx/will/fake-server-refactor
Stub Server Port Conflicts and Refactor
2013-12-19 06:55:24 -08:00
Will Daly
0fd03cfb02 Moved stub servers to terrain
Refactored stub services for style and DRY

Added unit tests for stub implementations

Updated acceptance tests that depend on stubs.

Updated Studio acceptance tests to use YouTube stub server; fixed failing tests in devstack.
2013-12-19 09:12:41 -05:00
polesye
24106a9203 BLD-590: Fix typos in Announcement template. 2013-12-19 14:14:30 +02:00
David Baumgold
36f35ac926 Reformat xml_importer.py to be more readable 2013-12-18 16:17:05 -05:00
polesye
70518a4659 BLD-506: Update behavior of start/end time fields. 2013-12-18 09:43:11 +02:00
Sarina Canelake
bc625ab571 Merge pull request #1904 from tusbar/player-size
Stop forcing video player’s speeds widget width
2013-12-17 13:16:05 -08:00
Don Mitchell
b776590226 Rename BlockUsageLocator's block_id field from usage_id
usage_id implies self-sufficiency. The block_id is relative to its structure.
2013-12-17 12:15:32 -05:00
Oleg Marshev
59d18134b2 Fix lis_outcome_service_url sending. 2013-12-17 17:33:02 +02:00
polesye
335a36f17c Address comments. 2013-12-17 13:22:08 +02:00
polesye
887eea30c9 Add comments. 2013-12-17 13:22:08 +02:00
polesye
6e01ce50c9 Add unit tests. 2013-12-17 13:22:08 +02:00
polesye
4e10c72988 BLD-21: Show answer for imageresponse. 2013-12-17 13:22:08 +02:00
Valera Rozuvan
0079243746 LTI additional Python tests. LTI must use HTTPS for lis_outcome_service_url.
BLD-564.
2013-12-17 12:47:49 +02:00
Valera Rozuvan
f03f3ebf96 Adding Jasmine tests for ImageInput. 2013-12-17 12:21:27 +02:00
Valera Rozuvan
06b6535fb1 Using jQuery for all DOM manipulation. 2013-12-17 12:21:27 +02:00
Valera Rozuvan
7ebeccd4bf Updating ImageInput JS code base. 2013-12-17 12:21:19 +02:00
e0d
d52b959ff1 fixing merge conflicts 2013-12-16 15:02:14 -05:00