ichuang
|
c555bf5a8d
|
fix capa to add contextualize_text for optionresponse and multiplechoice
|
2013-01-03 22:57:24 -05:00 |
|
Brian Wilson
|
c5cc15a92a
|
return json, and add validation errors. Start displaying field with error.
|
2013-01-03 18:51:26 -05:00 |
|
Carlos Andrés Rocha
|
95e7f2f1eb
|
Merge pull request #1226 from MITx/content/rocha/media-kit
Fix error in one of the media kit assets URLs
|
2013-01-03 15:30:08 -08:00 |
|
Carlos Andrés Rocha
|
59f4962cfa
|
Fix error in one of the media kit assets URLs
|
2013-01-03 18:29:34 -05:00 |
|
Carlos Andrés Rocha
|
c3d7bbe0e0
|
Merge pull request #1225 from MITx/content/rocha/media-kit
Minor style changes to home page and media kit page
[Finishes #41872203]
|
2013-01-03 15:07:55 -08:00 |
|
Carlos Andrés Rocha
|
25cb6d5a22
|
Minor style changes to home page and media kit page
[#41872203]
|
2013-01-03 18:06:22 -05:00 |
|
David Ormsbee
|
67dea0c3c3
|
Merge pull request #1224 from MITx/content/rocha/media-kit
Add media kit page
|
2013-01-03 14:50:57 -08:00 |
|
Diana Huang
|
fe86c25f72
|
Bug fixes for the JS and the peer grading service
|
2013-01-03 17:23:30 -05:00 |
|
Carlos Andrés Rocha
|
2e6ac2f72c
|
Fix link to root page on the main page footer
|
2013-01-03 17:21:54 -05:00 |
|
Don Mitchell
|
7dfa4e2cba
|
Tabla rasa problem for expert authors
|
2013-01-03 17:20:40 -05:00 |
|
Brian Talbot
|
a67b54bf82
|
media kit - added initial styles to media kit page
|
2013-01-03 17:10:16 -05:00 |
|
Diana Huang
|
28501ca58e
|
Merge branch 'master' into diana/peer-grading-views
|
2013-01-03 16:23:14 -05:00 |
|
Diana Huang
|
078b2a5b95
|
Fix up some minor state issues and
complete basic JS functionality for page
|
2013-01-03 16:19:04 -05:00 |
|
Don Mitchell
|
3e16e4cf5f
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-03 14:43:00 -05:00 |
|
Don Mitchell
|
ac5b48e827
|
Treat metadata['markdown'] as not key/value editable but still
persistable.
|
2013-01-03 14:42:40 -05:00 |
|
cahrens
|
533f4876b5
|
Rename, add css file.
|
2013-01-03 14:27:32 -05:00 |
|
Brian Talbot
|
e10e87e6ec
|
media kit - revised link styling on homepage
|
2013-01-03 14:21:07 -05:00 |
|
cahrens
|
8dd02c7ec7
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-03 14:11:58 -05:00 |
|
cahrens
|
f443c66bcd
|
Rename, add css file.
|
2013-01-03 14:11:53 -05:00 |
|
Diana Huang
|
becffd4dbb
|
Updated html and javascript for new pages as well
as a fix for the peer grading service
|
2013-01-03 14:08:56 -05:00 |
|
Don Mitchell
|
d11243578b
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-03 13:50:16 -05:00 |
|
Diana Huang
|
c0001597a3
|
Update some of the templates so that they don't break
|
2013-01-03 13:47:29 -05:00 |
|
Diana Huang
|
1c1034c63b
|
Pass location as a parameter, not as a part of the url
|
2013-01-03 13:47:03 -05:00 |
|
Don Mitchell
|
63791b2a6b
|
Numerical response template has markdown init
|
2013-01-03 13:46:45 -05:00 |
|
cahrens
|
b4312cbfef
|
Starting the markdown editor.
|
2013-01-03 13:39:01 -05:00 |
|
Carlos Andrés Rocha
|
bd0a2f6630
|
Add content and assets for media kit
[# 41872203]
|
2013-01-03 13:28:45 -05:00 |
|
Don Mitchell
|
f3ba15731c
|
Cache to swap branches
|
2013-01-03 13:04:30 -05:00 |
|
David Ormsbee
|
559bf8874a
|
Merge pull request #1132 from MITx/vik/modify_open_ended
Vik/modify open ended
|
2013-01-03 10:00:31 -08:00 |
|
Diana Huang
|
962d83d71b
|
Display a message when there are no problems to grade
|
2013-01-03 13:00:02 -05:00 |
|
Diana Huang
|
bd47b0c79a
|
New urls and corresponding views in the grading service
|
2013-01-03 12:59:34 -05:00 |
|
Chris Dodge
|
0743adb1cd
|
update grade download csv content
|
2013-01-03 12:58:59 -05:00 |
|
Calen Pennington
|
ecd2304cc9
|
Merge pull request #1223 from MITx/fix/zoldak/lms-acceptance-testing
Add splinter to test-requirements.txt
|
2013-01-03 09:51:21 -08:00 |
|
cahrens
|
e09a8e4a9b
|
Don't show markdown if it doesn't exist.
|
2013-01-03 12:50:38 -05:00 |
|
Jay Zoldak
|
fd902165c0
|
Add splinter to test-requirements.txt
|
2013-01-03 12:34:54 -05:00 |
|
cahrens
|
1c886b33cd
|
Get buttons working again (with old behavior).
|
2013-01-03 12:24:17 -05:00 |
|
Vik Paruchuri
|
90d902d105
|
Fix file version
|
2013-01-03 12:11:27 -05:00 |
|
Vik Paruchuri
|
1af35582fd
|
Merge branch 'master' into vik/modify_open_ended
|
2013-01-03 12:08:51 -05:00 |
|
David Ormsbee
|
2daddff2ef
|
Merge pull request #1217 from MITx/feature/zoldak/lms-acceptance-testing
Merge the lettuce acceptance test framework to master
|
2013-01-03 09:06:47 -08:00 |
|
Don Mitchell
|
b5b11c696a
|
Merge branch 'feature/cas/speed-editor' of git@github.com:MITx/mitx.git into feature/cas/speed-editor
|
2013-01-03 12:03:40 -05:00 |
|
Don Mitchell
|
47ca316d25
|
populate markdown into problem editor template
|
2013-01-03 12:02:45 -05:00 |
|
Vik Paruchuri
|
b01666f6d6
|
Fix error messages
|
2013-01-03 11:52:35 -05:00 |
|
Vik Paruchuri
|
5567477c67
|
Pass through initial display and answer
|
2013-01-03 11:52:35 -05:00 |
|
Vik Paruchuri
|
0c3eb67d5c
|
More descriptive error message
|
2013-01-03 11:52:35 -05:00 |
|
Vik Paruchuri
|
cce6b70103
|
Fixes to log entire state on errors, format feedback better
|
2013-01-03 11:52:05 -05:00 |
|
Vik Paruchuri
|
68f0f7e0a8
|
Handle unicode feedback
|
2013-01-03 11:50:57 -05:00 |
|
Vik Paruchuri
|
a4eb76017b
|
Display max score as well as score
|
2013-01-03 11:50:57 -05:00 |
|
Vik Paruchuri
|
9559c7b426
|
Patch "correct" answer display
|
2013-01-03 11:50:57 -05:00 |
|
Vik Paruchuri
|
37af39ef8d
|
Change names
|
2013-01-03 11:50:57 -05:00 |
|
Vik Paruchuri
|
5caa42fbe3
|
Reset some files
|
2013-01-03 11:50:57 -05:00 |
|
Vik Paruchuri
|
11c330bf52
|
Fix rebase issues
|
2013-01-03 11:50:22 -05:00 |
|