Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,093 Commits 1 Branch 0 Tags
91f6481e6de52271ee1cd9b7ac2bc081bbab124d
Commit Graph

20093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
91f6481e6d Merge pull request #2025 from edx/will/saner-page-object-structure 
Moved bok-choy page objects and setup.py to common/test/bok_choy
 2013-12-23 05:44:37 -08:00
Will Daly
9462183ae2 Moved bok-choy page objects and setup.py to common/test/bok_choy 2013-12-22 21:53:08 -05:00
David Baumgold
abdc5d1e7d Merge pull request #1975 from edx/db/revert-revert-https-fonts 
Studio HTTPS Fonts (re-enable)
 2013-12-22 05:13:05 -08:00
David Baumgold
d12571744c Add @tusbar to AUTHORS file 
To acknowledge his help with refactoring URLs in our CSS to be
protocol-relative
 2013-12-22 08:11:37 -05:00
Brian Talbot
2d8a80bd78 Merge pull request #2019 from edx/talbs/tinymce-fonts 
TinyMCE: Updating Google Font Syntax
 2013-12-21 07:50:54 -08: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
Calen Pennington
4cfe1e80ce Merge pull request #1899 from cpennington/descriptor-handler-url 
Add handler_url usable by descriptors
 2013-12-20 12:03:00 -08:00
Brian Talbot
06745e1ce9 revising tinymce font import syntax 
* matches syntax used when importing Open Sans in LMS/Studio
* simplifies and moves syntax to modern Google Web Font standards
* maintains the http/https agnostic work
 2013-12-20 14:15:11 -05:00
e0d
67b90751e3 Merge pull request #1997 from edx/e0d/unicode-bug 
script bombs if comments include unicode
 2013-12-20 11:10:42 -08:00
Calen Pennington
aa57481ecc Add handler_url usable by descriptors 
[LMS-1614]
 2013-12-20 14:05:53 -05:00
Calen Pennington
8e98c8cbb7 Merge pull request #2015 from cpennington/image-response-acceptance-tests 
Add acceptance test of image response
 2013-12-20 11:03:15 -08:00
Calen Pennington
32fa35c8f4 Merge pull request #2007 from cpennington/gst-acceptance-tests 
Add acceptance tests of GST module
 2013-12-20 11:01:27 -08: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
Calen Pennington
a0b8577ac3 Merge pull request #1988 from cpennington/annotation-module-acceptance-tests 
Add acceptance tests of Annotatable module
 2013-12-20 11:00:41 -08:00
Brian Talbot
6d6bcb7938 Merge pull request #1968 from edx/talbs/lms-fonts 
LMS: Use Open Sans Typeface via Google Web Fonts
 2013-12-20 10:21:41 -08:00
Brian Talbot
93d7dfb6b0 Merge pull request #1956 from edx/talbs/studio-fonts 
Studio: Updating Google Font Syntax
 2013-12-20 10:20:36 -08:00
Christina Roberts
3c0df16b0c Merge pull request #2004 from edx/christina/fix-thumbnail-warning 
Properly format errors/warnings.
 2013-12-20 10:11:12 -08:00
Ned Batchelder
dfb04bc4c9 Merge pull request #2017 from edx/ned/i18n-minor-improvements 
Minor i18n improvements
 2013-12-20 10:03:06 -08:00
Calen Pennington
194e0e973f Add acceptance tests of capa image input 2013-12-20 12:32:15 -05:00
Calen Pennington
0e237a85e6 Add acceptance test of the Graphical Slider Tool [LMS-1641] 2013-12-20 12:32:15 -05:00
Calen Pennington
06fadcdc0c Make conditional module and poll modules a little easier to understand 2013-12-20 12:32:15 -05:00
Calen Pennington
268c4fa01b Add acceptance tests of the conditional module [LMS-1639] 2013-12-20 12:32:15 -05:00
Calen Pennington
a9a8dcf882 Allow acceptance test problem functions to work without hardcoded course name 2013-12-20 12:32:15 -05:00
Calen Pennington
77942cecef Don't create more factory subclasses, just absorb the classes directly 2013-12-20 12:32:14 -05:00
Calen Pennington
7e91ba63ab Add acceptance tests of the annotatable module [LMS-1638] 2013-12-20 12:32:14 -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
Sarina Canelake
1295e763cc Merge pull request #2013 from edx/sarina/update-contributing 
Set review timeframe more appropriately in contributing docs
 2013-12-20 08:46:21 -08:00
jmclaus
9de690afeb Merge pull request #1796 from edx/jmclaus/feature_jsinput_template 
Added JSInput template in Studio.
 2013-12-20 08:44:42 -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
srpearce
ce18bcecda Merge pull request #2016 from edx/markhoeber/documentation/stud-1033 
added detail about tolerance for numerical problems
 2013-12-20 07:59:51 -08:00
Don Mitchell
a46e112a04 Improve test coverage 
and fix found errors.
 2013-12-20 10:44:01 -05:00
Ned Batchelder
c37ab38599 Remove needless non-package non-specs from urls.py 2013-12-20 10:26:34 -05:00
Ned Batchelder
550f15caea i18n tests run better: no subprocess output, and no duplication of tests. 2013-12-20 10:26:08 -05:00
Ned Batchelder
f1f76a9ad1 Dummy text has more accents, and properly ignored more non-text things. 2013-12-20 10:25:32 -05:00
Ned Batchelder
5e244b1c3b Minor style changes to the i18n directory. 2013-12-20 10:24:33 -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
9f1bdc534d Merge pull request #1986 from edx/valera/move_logme_module_separate_file 
Moving logme Require JS module out of individual XModules/Capa problems.
 2013-12-20 06:45:51 -08:00
zubair-arbi
ef51f74a36 Merge pull request #1749 from zubair-arbi/zub/bugfix/std823-addbaseview 
Added baseview(extended from backbone view), which can further extended ...
 2013-12-20 06:37:58 -08:00
Mark Hoeber
4f0b800d67 added detail about tolerance for numerical problems 
Add minor detail based on feedbback in training class -- use word
tolerance for margin of error, as that's what people searched on.  add
example for both percentage and numerical tolerance
 2013-12-20 09:36:19 -05:00
Calen Pennington
7f76517ea3 Cleanup courseware acceptance tests 2013-12-20 09:29:23 -05: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
Will Daly
f58e788b83 Merge pull request #1971 from edx/will/selenium-pages 
Added Selenium page objects for LMS and studio
 2013-12-20 06:05:30 -08:00
Will Daly
d23f48f573 Merge pull request #2002 from edx/will/rebalance-shards 
Rebalance acceptance test shards
 2013-12-20 05:45:22 -08:00
Zubair Afzal
a6fbcbd781 Add baseview(extended from backbone view), which can further extended by other views + Add fucntion to modify iframe and embed tags + add related tests 
STUD-823
 2013-12-20 18:38:24 +05:00
Sarina Canelake
608aaf31e8 Merge pull request #2012 from edx/sarina/grade-download-wording 
Tweak language surrounding grade download button
 2013-12-19 21:43:25 -08:00
e0d
6134bb5384 cr comments 2013-12-19 23:09:23 -05:00
Sarina Canelake
f330b1e65f Tweak language surrounding grade download button 2013-12-19 18:16:07 -08:00
Sarina Canelake
93b6ca1140 Set review timeframe more appropriately in contributing docs 2013-12-19 18:09:18 -08:00
Mark Hoeber
e1451ab1c1 Merge pull request #2009 from edx/markhoeber/documentation/release-notes-12-17-13 
Markhoeber/documentation/release notes 12 17 13
 2013-12-19 16:08:37 -08:00