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

20114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zubair-arbi
e24ddaa329 Merge pull request #2026 from zubair-arbi/zub/bugfix/std988-gradingtypes 
Grading types should not allow empty field for "Total Number" and "Numbe...
 2013-12-26 01:19:01 -08:00
zubiar-arbi
4cb03f43a2 Grading types should not allow empty field for "Total Number" and "Number of Droppable" 
STUD-988
 2013-12-26 13:51:53 +05:00
Anton Stupak
23dc10d004 Merge pull request #1998 from edx/anton/fix-video-in-ipad 
Fix video controls on iPad.
 2013-12-24 22:40:25 -08:00
Jay Zoldak
a68f59292a Merge pull request #1963 from edx/zoldak/update-changelog 
Update changelog with studio marketing site feature
 2013-12-24 10:39:21 -08:00
Will Daly
b992a0c33d Merge pull request #2037 from edx/will/npm-registry 
Set the registry for node in prereqs
 2013-12-24 06:40:50 -08:00
Will Daly
ed04148c5b Set the registry for node in prereqs 2013-12-24 09:15:15 -05: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
Mark Hoeber
9dcc13a9fd Merge pull request #2035 from edx/markhoeber/documentation/remove_stray_file 
Removed extra file
 2013-12-23 14:22:03 -08:00
Mark Hoeber
71a5d81469 Removed extra file 
Removing long-file-name, stray file from earlier commit
 2013-12-23 16:26:27 -05:00
srpearce
83ae4ee604 Merge pull request #2021 from edx/sylvia/documentation/ORA-279 
Add instructor notes to document
 2013-12-23 12:41:11 -08:00
spearce
de9b8bcbc9 Update formatting for notes to instructor 
Change formatting for notes to instructor from table to warning
 2013-12-23 14:40:10 -05: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
Will Daly
c3fbdd682a Merge pull request #2027 from edx/will/fix-page-object-install 
Add base package to edxapp page object setup.py
 2013-12-23 08:30:16 -08:00
Adam
80aa0eb089 Merge pull request #2028 from edx/adam/fix-error-student-data 
corrects typo in legacy.py (LMS-1675)
 2013-12-23 07:57:05 -08:00
Adam Palay
b923521a47 corrects typo in legacy.py (LMS-1675) 2013-12-23 09:43:57 -05:00
Will Daly
659e590fc9 Add base package to edxapp page object setup.py 2013-12-23 09:33:32 -05:00
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
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
spearce
4af4e2e05d Add instructor notes to document 
Add template instructions for course teams, letting them know where
they should modify the text according to their courses
 2013-12-20 15:53:15 -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
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