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

10908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arthur Barrett
1da644fcb3 merge from master. resolved conflict with test_responsetypes.py by using the version from master. 2013-02-28 11:22:32 -05:00
Christina Roberts
1ebc3b314d Merge pull request #1566 from MITx/fix/cdodge/optimize-metadata-tree-computation 
Fix/cdodge/optimize metadata tree computation
 2013-02-28 07:28:48 -08:00
Diana Huang
9429262ca4 Merge pull request #1563 from MITx/fix/will/capa_response_unit_tests 
Fix/will/capa response unit tests
 2013-02-28 07:05:15 -08:00
David Ormsbee
456972de5c Merge pull request #1562 from MITx/feature/jarv/org-staff-access 
Creating group for organization staff access DO NOT MERGE
 2013-02-28 06:53:56 -08:00
Will Daly
71d0a367aa Fixed an error in the JavascriptResponseTest: coffee files 
were not being compiled before the LoncapaProblem initializer was
called.
 2013-02-28 09:45:27 -05:00
Chris Dodge
8a7211da05 remove unused import commands (which were used for temporary profiling). Also change get_lms_link_for_item() to preserve the previous argument ordering. Apparently all callers may not use argument name conventions for the 'preview' argument. 2013-02-28 09:40:30 -05:00
Don Mitchell
38830f001f Merge pull request #1564 from MITx/bug/christina/misc 
Bug/christina/misc
 2013-02-28 06:29:34 -08:00
Chris Dodge
905199b5eb restore metadata inheritance. Fix lms jump computation on the Studio index page. This gets expensive. 2013-02-27 22:37:13 -05:00
Chris Dodge
e42cdfbd29 turn off metadata inheritence for a quick test 2013-02-27 21:45:17 -05:00
Chris Dodge
d0bbb0f6c9 use a different query to get all collections. Also don't apply inheritance to course modules, because that's ultimately a no-op 2013-02-27 20:43:49 -05:00
Victor Shnayder
f33c575412 Merge pull request #1565 from MITx/fix/brian/pdfchapter_ff 
fix viewing of pdfbook on firefox
 2013-02-27 15:25:36 -08:00
cahrens
e47d11bedc Bug fix for #214. 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/214-Via-Tender-Numerical-Input-answer-0-a-tolerance-is-not-accepted#ticket-214-4
 2013-02-27 17:36:28 -05:00
cahrens
c0f0ef0cd2 Bug fix for #214. 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/214-Via-Tender-Numerical-Input-answer-0-a-tolerance-is-not-accepted#ticket-214-4
 2013-02-27 17:34:08 -05:00
Will Daly
7e48de1ef3 Reset responsetypes.py to version on master 2013-02-27 17:22:26 -05:00
Brian Wilson
907cd50503 fix viewing of pdfbook on firefox 2013-02-27 17:09:50 -05:00
Arthur Barrett
bc49d50fc2 fixed the max points in the annotation response 2013-02-27 16:53:17 -05:00
Will Daly
043d316d53 Removed test files that are now replaced with XML Factories 2013-02-27 16:40:48 -05:00
Will Daly
ce7256eda9 Removed unused SymbolicResponseXMLFactory 2013-02-27 16:40:05 -05:00
Arthur Barrett
8f89768d62 added annotationresponse grade test 2013-02-27 16:29:25 -05:00
Will Daly
c1324ec21d Modified CodeResponse to use XML factory 2013-02-27 16:25:19 -05:00
John Jarvis
48242d3a06 Adding instructor_<org> 2013-02-27 15:30:07 -05:00
Will Daly
6e4c418a11 Updated JavscriptResponse to use XML factory 2013-02-27 15:26:29 -05:00
Arthur Barrett
2f4d6f7bbf fixed doc block for annotationinput 2013-02-27 15:25:04 -05:00
Victor Shnayder
8543235306 Merge pull request #1558 from MITx/fix/will/symmath_check_unit_tests 
Added additional unit tests for symmath library that verify symmath_check for simple symbolic input strings.
 2013-02-27 12:19:47 -08:00
Will Daly
3f81fe010c Implemented tests for ImageResponse 2013-02-27 15:05:21 -05:00
John Jarvis
ce2f1400e6 formatting 2013-02-27 15:05:02 -05:00
Arthur Barrett
1a0220c765 added a validation check on the input choice attribute 2013-02-27 15:04:30 -05:00
John Jarvis
7c0d9ff156 Creating group for organization staff access 2013-02-27 14:55:17 -05:00
Arthur Barrett
44a68e6903 added partially correct icon from marco 2013-02-27 14:36:14 -05:00
Will Daly
53b3b79f96 Implemented tests of hints for <formularesponse> 2013-02-27 14:13:49 -05:00
Arthur Barrett
b84d0ba8ba updated comments 2013-02-27 14:04:49 -05:00
Arthur Barrett
9f8e172be9 show the status mark next to the submitted tag instead of at the bottom of the problem. 2013-02-27 13:35:10 -05:00
Christina Roberts
1ed2720977 Merge pull request #1560 from MITx/bug/btalbot/studio-codemirrorlineheight 
studio - CodeMirror lines + cursor bug
 2013-02-27 10:11:03 -08:00
Brian Talbot
73ae818958 studio - fixing padding of codeMirror fields to match height of others given new line height 2013-02-27 13:08:56 -05:00
Brian Talbot
cdd6ce708e studio - reducing line height for codemirror JSON lines 2013-02-27 13:07:58 -05:00
Brian Talbot
524f48b68e studio - fixing padding of codeMirror fields to match height of others given new line height 2013-02-27 13:03:36 -05:00
Brian Talbot
45520fe124 studio - fixing line heights not syncing with code mirror lines and cursor 2013-02-27 12:59:25 -05:00
Arthur Barrett
25fb210338 move return link to problem header 2013-02-27 12:45:58 -05:00
Carlos Andrés Rocha
2ca303c95d Merge pull request #1526 from MITx/feature/cas/manual-policy-merged 
Feature/cas/manual policy merged
 2013-02-27 09:02:07 -08:00
Arthur Barrett
afa7fca15a Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-27 11:58:38 -05:00
David Ormsbee
0c5ca91c71 Merge pull request #1559 from MITx/dave/feature/delete_student_state 
Taking Ike's delete-student-state-for-problem code and putting it in a separate PR
 2013-02-27 08:44:26 -08:00
David Ormsbee
c7920f09ad Taking Ike's delete-student-state-for-problem code and putting it in a separate PR so it's not bundled with more debated features. 2013-02-27 11:42:06 -05:00
Will Daly
e65a017c74 Added additional unit tests for symmath library that verify 
symmath_check for simple symbolic input strings.
 2013-02-27 10:19:02 -05:00
Ned Batchelder
f828049043 Change TorontoX to University of TorontoX 2013-02-27 10:05:58 -05:00
Arthur Barrett
e3f12607cd add grading for annotationinput 2013-02-27 01:44:07 -05:00
Victor Shnayder
b18ebd9676 Merge pull request #1556 from MITx/feature/dave/ext_docs 
Non-developer docs for course staff and researchers
 2013-02-26 18:32:10 -08:00
David Ormsbee
51a863bd6b Merge pull request #1557 from MITx/feature/brian/pdfchapter 
Feature/brian/pdfchapter
 2013-02-26 15:00:58 -08:00
Arthur Barrett
9d939cba94 added more unit tests to module 2013-02-26 17:49:18 -05:00
Arthur Barrett
8162d5473f added more unit tests for module 2013-02-26 17:08:01 -05:00
Will Daly
9360c3fa9a Added test for StringResponse hints 2013-02-26 16:55:18 -05:00