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

10771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Brian Wilson
310073ddef use same images for prev/next as used in image-based textbooks 2013-02-26 16:43:48 -05:00
Brian Wilson
19567cc3d5 update styling of pdfs to be more like textbooks 2013-02-26 15:19:23 -05:00
Arthur Barrett
12b30c1b69 added unit test 2013-02-26 14:24:10 -05:00
David Ormsbee
8f4d11a608 set build dir back to where it is by default 2013-02-26 13:39:11 -05:00
David Ormsbee
f0c84d4b53 Added the .nojekyll file in the wrong place. 2013-02-26 12:38:41 -05:00
David Ormsbee
eeddf89c34 doc config changes to make things compatible with GitHub pages 2013-02-26 12:21:19 -05:00
Arthur Barrett
18233ef0d7 bolded the section titles and added unittest skeleton for module 2013-02-26 12:15:43 -05:00
David Ormsbee
49563eae18 Delete course_grading.md and xml-format.md (moved to doc/public) 2013-02-26 11:59:51 -05:00
David Ormsbee
dc27d197e6 Changed title of public docs to edX Data 2013-02-26 11:31:03 -05:00
David Ormsbee
972df00f84 Copied over drag and drop docs, graphical slider tool docs to public, non-dev documentation 2013-02-26 11:20:36 -05:00
David Ormsbee
102494f643 Add grading doc and split internal and course data docs into subdirs 2013-02-26 11:11:29 -05:00
David Ormsbee
d3c784a4e7 More formatting/editing of Course XML guide. 2013-02-26 10:55:14 -05:00
VikParuchuri
df01064e77 Merge pull request #1536 from MITx/diana/rubric-hot-keys 
Add in rubric hotkeys
 2013-02-26 06:46:26 -08:00
David Ormsbee
76320b0e19 Add slightly revised course XML tutorial 2013-02-26 02:22:59 -05:00
Brian Wilson
fc9ab346e1 fix loading of specific pages. 2013-02-26 01:03:01 -05:00
Victor Shnayder
ab3eb99b6f Merge pull request #1552 from MITx/jth/fix_draganddrop 
Jth/fix draganddrop
 2013-02-25 16:29:50 -08:00
John Hess
ac7fe0631a fixed excess_draggable behavior so that true means it is actually excess 2013-02-25 19:20:37 -05:00
Victor Shnayder
9fb1c0b284 Merge pull request #1553 from MITx/fix/will/symbolic_response_does_not_accept_zero 
Fixed an error in symmath_check
 2013-02-25 15:50:33 -08:00
John Hess
d265c255ec Merge branch 'master' of github.com:MITx/mitx 2013-02-25 18:42:39 -05:00
John Hess
fbce425152 drag and drop now correctly handles cases where no draggables should be dragged 2013-02-25 18:42:34 -05:00
Will Daly
850d9846f8 Fixed an error in symmath_check that occurred when 
the expected result = 0.  symmath_check() was dividing
a quantity by the expected result, leading to a NaN value
that caused the answer to be marked incorrect.

Added test_symmath_check.py with basic tests for
the symmath_check() function.
 2013-02-25 18:34:35 -05:00
David Ormsbee
a2a536b5ed Add docs sketching data formats. 2013-02-25 17:03:59 -05:00
Brian Wilson
dde2cd0bd0 get chapter links to start working 2013-02-25 16:52:32 -05:00
Arthur Barrett
1f160d6ef4 added a box around the instructions text 2013-02-25 16:29:19 -05:00
chrisndodge
ae681a52f9 Merge pull request #1549 from MITx/bug/dhm/video 
Somehow the saves changed to just sets w/ don't send data to the server.
 2013-02-25 10:30:47 -08:00
Arthur Barrett
7b195eb0ee fixed error if highlight not defined 2013-02-25 13:24:05 -05:00
Arthur Barrett
1721793e99 moved annotation return styling effect to css 2013-02-25 12:33:43 -05:00
Don Mitchell
bb0ad61f81 Somehow the saves changed to just sets w/ don't send data to the server. 2013-02-25 12:13:50 -05:00
David Ormsbee
f519c4f571 Merge pull request #1474 from MITx/feature/victor/revert-revert-of-forums-ui 
Feature/victor/revert revert of forums ui
 2013-02-25 09:03:33 -08:00
Victor Shnayder
fe47d96969 Merge pull request #1547 from MITx/fix/will/cs191_symmath_check_ans=0_bug 
Fixed a bug in symmath_check():
 2013-02-25 08:48:23 -08:00
Arthur Barrett
e736ed34f5 added ability to hide/show instructions, if present 2013-02-25 11:29:59 -05:00
David Ormsbee
dde4fc981b Merge pull request #1546 from MITx/fix/cdodge/make-jump-to-handle-lost-slash 
add a 'missing slash' regular expression for Location patterns in order ...
 2013-02-25 08:22:24 -08:00
Will Daly
862ce67bfc Fixed a bug in symmath_check(): one of the if statements 
evaluated bool(ans), which is False when ans=0.
This led to an error message "[symmath_check] failed to get MathML for
input; dynamath=[None]" when the function reached a later condition.
The check that evaluated  bool(ans) was redundant, so I removed it.
 2013-02-25 10:59:33 -05:00
Chris Dodge
752ff20cf5 add a 'missing slash' regular expression for Location patterns in order to account for dropped slash with the i4x:// pattern. Certain redirect cases will cause this 2nd slash to be dropped (I think via Nginx) 2013-02-25 10:45:00 -05:00
David Ormsbee
3a0c1eaa71 Merge pull request #1545 from MITx/feature/victor/dynamic-cohorts 
Feature/victor/dynamic cohorts
 2013-02-25 07:26:25 -08:00
Your Name
9f58f6890d Merge branch 'master' into feature/victor/revert-revert-of-forums-ui 2013-02-25 09:31:28 -05:00
Brian Wilson
fa00ea442e add first pass at multi-chapter support. 2013-02-25 01:26:34 -05:00
Victor Shnayder
db06efae75 Prevent scroll-to-top on clicks in cohorts views 
Have to return false from event handlers to avoid href="#"
links from sending the user to the top of the page.
 2013-02-24 19:44:41 -05:00
Victor Shnayder
01a38c29be Add auto-cohorting functionality. 
See changes in xml-format.md or wiki (dynamic cohorts v1) for spec.
 2013-02-24 18:48:01 -05:00
Victor Shnayder
8e93e0770f Merge pull request #1509 from MITx/feature/victor/capa-finished 
Add showanswer="finished" option and tests
 2013-02-24 13:24:34 -08:00
Arthur Barrett
c3f55845c0 factoring out discussion logic (for now, anyway) 2013-02-22 18:22:32 -05:00