Diana Huang
|
befe36f626
|
Improvements to calibration feedback step
|
2013-01-04 14:11:48 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Brian Talbot
|
e10e87e6ec
|
media kit - revised link styling on homepage
|
2013-01-03 14:21:07 -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 |
|
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 |
|
Carlos Andrés Rocha
|
bd0a2f6630
|
Add content and assets for media kit
[# 41872203]
|
2013-01-03 13:28:45 -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 |
|
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 |
|
Jay Zoldak
|
fd902165c0
|
Add splinter to test-requirements.txt
|
2013-01-03 12:34:54 -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 |
|
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 |
|
Vik Paruchuri
|
2c469cad75
|
Wire in submit message
|
2013-01-03 11:49:01 -05:00 |
|
Vik Paruchuri
|
1ac75b9420
|
Add in message passing pipeline
|
2013-01-03 11:47:41 -05:00 |
|
David Ormsbee
|
86247139a9
|
Merge pull request #1129 from MITx/valera/require-js
Inclusion of namespaced Require JS
|
2013-01-03 08:44:30 -08:00 |
|
Diana Huang
|
09ed3d12a2
|
Hook up the backend into the new feedback response for scores
|
2013-01-03 11:40:41 -05:00 |
|
Diana Huang
|
c87d0f11d6
|
Show error when no score selected
|
2013-01-03 11:40:41 -05:00 |
|
Diana Huang
|
de7d6f184a
|
Parse out the score given into an int.
|
2013-01-03 11:40:41 -05:00 |
|
Diana Huang
|
8f4efb0456
|
Hook up new radio buttons to the Javascript
|
2013-01-03 11:40:41 -05:00 |
|
Diana Huang
|
69ae1cc268
|
Clean up the styling and make the evaluation parts collapsible.
|
2013-01-03 11:40:41 -05:00 |
|
Diana Huang
|
54c541de45
|
Fix up the feedback-on-feedback styling and add radio button score selection.
|
2013-01-03 11:40:41 -05:00 |
|
Vik Paruchuri
|
fa97187a31
|
Patch naming issue
|
2013-01-03 11:40:41 -05:00 |
|
Vik Paruchuri
|
ad41558379
|
Hide submit button
|
2013-01-03 11:40:41 -05:00 |
|