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 |
|
Arthur Barrett
|
25fb210338
|
move return link to problem header
|
2013-02-27 12:45:58 -05:00 |
|
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 |
|
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 |
|
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 |
|
Brian Wilson
|
fc9ab346e1
|
fix loading of specific pages.
|
2013-02-26 01:03:01 -05: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Brian Wilson
|
d42a12da59
|
Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js
|
2013-02-21 17:50:08 -05:00 |
|
Brian Wilson
|
8076c5b731
|
remove unneeded files (that break collectstatic)
|
2013-02-21 17:38:00 -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 |
|
Chris Dodge
|
103508b45d
|
remove empty attempts and weights from simple test course
|
2013-02-21 15:41:59 -05:00 |
|
Brian Wilson
|
d503fe3d79
|
Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js
|
2013-02-21 15:38:28 -05:00 |
|
Brian Wilson
|
d5e34b0a44
|
fix initialization of scale dropdown, and check for valid values of page number
|
2013-02-21 15:35:03 -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 |
|
Your Name
|
ff68853990
|
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
|
2013-02-21 13:30:24 -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 |
|