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

2755 Commits

Author SHA1 Message Date
Arthur Barrett
afa7fca15a Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-27 11:58:38 -05:00
Arthur Barrett
e3f12607cd add grading for annotationinput 2013-02-27 01:44:07 -05: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
Arthur Barrett
12b30c1b69 added unit test 2013-02-26 14:24:10 -05:00
Arthur Barrett
18233ef0d7 bolded the section titles and added unittest skeleton for module 2013-02-26 12:15:43 -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
John Hess
ac7fe0631a fixed excess_draggable behavior so that true means it is actually excess 2013-02-25 19:20:37 -05: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
Arthur Barrett
1f160d6ef4 added a box around the instructions text 2013-02-25 16:29:19 -05: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
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
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
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
Arthur Barrett
66ddfa295d more refactoring and work on annotationinput (should be working now). 2013-02-22 16:33:28 -05:00
Arthur Barrett
840f7839fa added save and render functionality to annotationinput 2013-02-22 12:48:22 -05:00
Vik Paruchuri
d5865e70b8 Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages 2013-02-22 10:21:34 -05:00
Diana Huang
f9667849b8 Fix some minor bugs in event handling and add enter key support 2013-02-22 09:47:50 -05:00
Diana Huang
3ecafa9b42 Add hot keys to rubrics 2013-02-22 09:47:50 -05:00
Arthur Barrett
78bf8d5876 update annotationinput jsonv alue on tag selection or comment change 2013-02-22 00:42:12 -05:00
Arthur Barrett
3970ea33e1 return from capa problem 2013-02-21 22:54:50 -05:00
Arthur Barrett
0e2c46a718 Clicking "reply to annotation" scrolls to the problem (specified in xml by problem=index). 2013-02-21 17:01:43 -05:00
Brian Wilson
d503fe3d79 Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js 2013-02-21 15:38:28 -05:00
Victor Shnayder
8d76556729 Merge pull request #1531 from MITx/fix/cdodge/serializing-ints-as-empty-strings 
Fix/cdodge/serializing ints as empty strings
 2013-02-21 12:12:44 -08:00
Diana Huang
76c4007449 Merge pull request #1522 from MITx/diana/click-tracking 
Add more click tracking and logging to the open ended grading interface
 2013-02-21 11:10:35 -08:00
Arthur Barrett
a8178de497 Added styling to the annotationinput capa problem. 2013-02-21 13:52:22 -05:00
Chris Dodge
bb75a23101 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings 2013-02-21 11:58:52 -05:00
David Ormsbee
3494d58450 Merge pull request #1532 from MITx/feature/ned/clean_up_tests 
Make sure temp directories are properly cleaned up so running tests does...
 2013-02-21 08:52:09 -08:00
Ned Batchelder
c3b571bf9b Make sure temp directories are properly cleaned up so running tests doesn't leave them behind. 2013-02-21 11:38:45 -05:00
Don Mitchell
ba7959fc4d Merge pull request #1511 from MITx/feature/cdodge/metadata-inheritence-crawling 
Feature/cdodge/metadata inheritence crawling
 2013-02-21 08:29:54 -08:00
Chris Dodge
68a8587ed2 don't serialize weight out as an int - use a string. The code in capa-module.py expects a string and tries to convert to a float. So this impedence mismatch is causing a crash on import when importing empty strings for 'weight' or 'attempts' 2013-02-21 11:02:47 -05:00
Diana Huang
9aac915c9f Remove unnecessary assignment 2013-02-21 10:33:48 -05:00
Diana Huang
3a8b7156a0 Merge branch 'master' into diana/click-tracking 2013-02-21 10:19:35 -05:00
Diana Huang
18a56005b0 Address code review feedback 
- make category a data field of an input
- namespace event types
- don't try to use the track function when it doesn't exist
- generate event types if it doesn't match a pre-existing pattern
 2013-02-21 10:17:08 -05:00
Arthur Barrett
cc7f791078 parse xml for annotationinput 2013-02-20 19:19:17 -05:00
Vik Paruchuri
9d5a08fc6d Fix location string 2013-02-20 18:07:24 -05:00
Vik Paruchuri
9bc8dbd7ca Fix location strings, re-order checkboxes 2013-02-20 18:04:25 -05:00
Vik Paruchuri
7b604aa026 Fix an import statement 2013-02-20 17:57:09 -05:00
Vik Paruchuri
43158de9bb Merge branch 'feature/vik/check-if-submission-allowed' into feature/vik/oe-messages 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
 2013-02-20 17:50:00 -05:00
Arthur Barrett
07f64abb11 Refactored init method. 2013-02-20 17:38:47 -05:00
Vik Paruchuri
c55f997086 Fix self assessment tests 2013-02-20 17:34:51 -05:00
Arthur Barrett
a982ebbb03 Refactored rendered method and added span ids. 2013-02-20 17:33:11 -05:00
Vik Paruchuri
912800cabf Fix location string object problems 2013-02-20 17:27:37 -05:00
Vik Paruchuri
a8fadb0ecc Remove render to string import 2013-02-20 17:16:38 -05:00
Vik Paruchuri
19a80c6268 Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
 2013-02-20 17:12:53 -05:00