Calen Pennington
|
789ac3fc87
|
Use the XBlock library as the base for XModule, so that we can incrementally rely on more and more of the XBlock api
|
2013-01-04 16:19:58 -05:00 |
|
Diana Huang
|
fa09e25a1a
|
Add interstitial page between calibration and grading.
Make individual Prompt and Rubric Sections hideable.
|
2013-01-04 15:18:39 -05:00 |
|
Diana Huang
|
e88fbd26e3
|
Merge branch 'master' into feature/diana/rubric-input
|
2013-01-04 14:12:18 -05:00 |
|
Diana Huang
|
befe36f626
|
Improvements to calibration feedback step
|
2013-01-04 14:11:48 -05:00 |
|
Brian Talbot
|
ce4994dd94
|
studio - revised course overview section collapse button to toggle collapsing/expanding
|
2013-01-04 13:27:59 -05:00 |
|
Diana Huang
|
ad63c492be
|
Minor updates to the page to handle showing Calibration feedback.
Also, allow for the hiding of the Prompt and the Rubric.
|
2013-01-04 12:42:38 -05:00 |
|
cahrens
|
2859cfddd0
|
minor cleanup
|
2013-01-04 12:37:00 -05:00 |
|
Chris Dodge
|
1d7baccb38
|
add info-icon.png
|
2013-01-04 11:41:16 -05:00 |
|
Diana Huang
|
d2228205e2
|
Merge branch 'master' into diana/peer-grading-views
|
2013-01-04 11:19:10 -05:00 |
|
Diana Huang
|
b5f34a9da6
|
Show special text when calibrating or when grading.
|
2013-01-04 11:03:24 -05:00 |
|
Chris Dodge
|
349fd89eb8
|
fix tests on merge
|
2013-01-04 10:32:31 -05:00 |
|
Carlos Andrés Rocha
|
d0221808db
|
Merge pull request #1228 from MITx/content/rocha/media-kit
Add new tab/window behavior to media kit
|
2013-01-04 07:07:43 -08:00 |
|
Brian Talbot
|
04524ef58f
|
media kit - added in new tab/window behavior for download links, revised edX name styling on homepage cta, and provided more context on logo download text
|
2013-01-04 10:02:14 -05:00 |
|
cahrens
|
ecfc96c73b
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-04 09:57:15 -05:00 |
|
cahrens
|
e017363ae1
|
Tabs now showing.
|
2013-01-04 09:56:52 -05:00 |
|
Don Mitchell
|
591f1be8ba
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-04 09:51:47 -05:00 |
|
Don Mitchell
|
d99e7f5d33
|
Supports markdown
|
2013-01-04 09:51:36 -05:00 |
|
cahrens
|
5493fd586a
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
|
2013-01-04 09:05:09 -05:00 |
|
cahrens
|
6d732c217b
|
Tabs now showing.
|
2013-01-04 09:04:27 -05:00 |
|
Brian Wilson
|
e32dfcf0a0
|
get display of validation errors to work.
|
2013-01-04 01:39:40 -05:00 |
|
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 |
|