Arthur Barrett
|
840f7839fa
|
added save and render functionality to annotationinput
|
2013-02-22 12:48:22 -05:00 |
|
Jay Zoldak
|
af2690fcaf
|
Update lettuce test framework to use a course factory instead of the studio UI for creating courses
|
2013-02-22 12:36:27 -05:00 |
|
Brian Talbot
|
de2b05bf66
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-02-22 12:01:50 -05:00 |
|
Julian Arni
|
e5294591dc
|
Foldit leaderboard w/o tests
|
2013-02-22 11:12:26 -05:00 |
|
Don Mitchell
|
c11d627c88
|
Chrome/Safari don't use keypress for backspace and delete.
|
2013-02-22 11:00:27 -05:00 |
|
Ned Batchelder
|
ff35d3e6d9
|
Merge in a cherry-picked commit
|
2013-02-22 10:54:01 -05:00 |
|
Ned Batchelder
|
2e21c71fc4
|
A script to run just one test, based on the test failure description.
|
2013-02-22 10:52:25 -05:00 |
|
Diana Huang
|
ed955df230
|
Merge pull request #1529 from MITx/feature/vik/oe-messages
Feature/vik/oe messages
|
2013-02-22 07:31:06 -08: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 |
|
Alexander Kryklia
|
4713c5f095
|
re-enable discussion service
|
2013-02-22 10:40:09 +02: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 |
|
Mark L. Chang
|
f1c8301e4f
|
added question marks
|
2013-02-21 22:47:48 -05:00 |
|
David Ormsbee
|
215f6aeb27
|
Merge pull request #1505 from MITx/feature/brian/pdf_js
Feature/brian/pdf js
|
2013-02-21 17:28:16 -08:00 |
|
Jay Zoldak
|
e337292b5f
|
Fix existing advanced settings lettuce tests.
|
2013-02-21 18:20:42 -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 |
|
chrisndodge
|
7e107119b7
|
Merge pull request #1535 from MITx/fix/cdodge/make-jump-to-handle-lost-slash
remove empty attempts and weights from simple test course
|
2013-02-21 12:43:15 -08:00 |
|
Chris Dodge
|
103508b45d
|
remove empty attempts and weights from simple test course
|
2013-02-21 15:41:59 -05:00 |
|
Brian Wilson
|
6d174ef029
|
remove dead code
|
2013-02-21 15:41:28 -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 |
|
Jay Zoldak
|
c10dc838b2
|
Fix tip on JSON key value pairs
|
2013-02-21 15:01:12 -05:00 |
|
Brian Talbot
|
22639adc63
|
studio - alerts WIP
|
2013-02-21 14:31:24 -05: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 |
|
Ned Batchelder
|
3580deaec0
|
Merge pull request #1534 from MITx/fix/zoldak/test-modulestore-naming
Change test modulestore naming differentiation scheme to uuid
|
2013-02-21 11:01:58 -08:00 |
|
Arthur Barrett
|
a8178de497
|
Added styling to the annotationinput capa problem.
|
2013-02-21 13:52:22 -05:00 |
|
Don Mitchell
|
e5efcf65d3
|
remove console.log
|
2013-02-21 13:34:11 -05:00 |
|
Don Mitchell
|
851a99cb13
|
remove commented out code
|
2013-02-21 13:32:29 -05:00 |
|
Your Name
|
ff68853990
|
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
|
2013-02-21 13:30:24 -05:00 |
|
Don Mitchell
|
697bd5c97b
|
also this one
|
2013-02-21 13:28:43 -05:00 |
|
Don Mitchell
|
116c74c075
|
Highlighting of field labels and smarter decision as to when to show the
save cancel bar.
|
2013-02-21 13:27:36 -05:00 |
|
Jay Zoldak
|
9eb2766943
|
Change test modulestore naming differentiation scheme to uuid
|
2013-02-21 13:07:14 -05:00 |
|
Chris Dodge
|
bc1ee3dbfa
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings
|
2013-02-21 12:56:20 -05:00 |
|
Chris Dodge
|
041d28f0e9
|
use better variable names to assert that the expected item was indeed loaded
|
2013-02-21 12:56:17 -05:00 |
|
Don Mitchell
|
49cab68aee
|
Merge pull request #1533 from MITx/fix/cdodge/template-got-renamed
template name got changed. Need to reflect that on test.
|
2013-02-21 09:27:23 -08:00 |
|
Chris Dodge
|
fa3402a977
|
template name got changed. Need to reflect that on test.
|
2013-02-21 12:25:10 -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
|
a7f6545cbc
|
add unit test
|
2013-02-21 11:22:20 -05: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 |
|
Brian Wilson
|
00e31c0116
|
fix toolbarViewer styling
|
2013-02-21 10:30:20 -05:00 |
|
Diana Huang
|
3a8b7156a0
|
Merge branch 'master' into diana/click-tracking
|
2013-02-21 10:19:35 -05:00 |
|