Diana Huang
3a29d260ae
Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements
2013-01-10 14:12:06 -05:00
Diana Huang
19bc657487
Use correct version of the grader id.
2013-01-10 12:44:54 -05:00
Diana Huang
393ee3533c
Merge branch 'master' into diana/peer-grading-improvements
2013-01-09 15:45:02 -05:00
Diana Huang
13c692c29b
Show back button when we see an error.
2013-01-09 14:59:59 -05:00
Diana Huang
54d91e7875
Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements
2013-01-09 14:44:08 -05:00
Diana Huang
c4d1b2e643
Use correct user id and make the reload button a back button
2013-01-09 14:41:23 -05:00
Diana Huang
950d398387
Updates to the CSS
2013-01-09 10:19:42 -05:00
Calen Pennington
941d55cee3
Merge pull request #1229 from MITx/feature/ichuang/update-symmath-server
...
Feature/ichuang/update symmath server
2013-01-09 06:10:32 -08:00
Calen Pennington
5a95dd28b1
Merge pull request #1227 from MITx/feature/ichuang/fix-capa-contextualize-text-for-option-response-and-mc
...
fix capa to add contextualize_text for optionresponse and multiplechoice
2013-01-09 06:08:45 -08:00
David Ormsbee
ecb3dd6134
Merge pull request #1239 from MITx/bugfix/dave/forum_missing_vertical
...
Fix parent lookups when the same named tag exists in multiple courses
2013-01-08 13:38:23 -08:00
David Ormsbee
1122cdb286
Added more comments in response to code review.
2013-01-08 16:37:31 -05:00
Diana Huang
f0f25296b2
Update documentation
2013-01-08 15:54:49 -05:00
David Ormsbee
051339afb0
Tiny cleanup.
2013-01-08 13:54:44 -05:00
David Ormsbee
8952eda98d
XML loaded courses should no longer be able to throw NoPathToItem.
...
The parent trees are built on a per-course basis (so it'll throw ItemNotFoundError
if an item exists in a different course from the one you're asking after. NoPathToItem
can still happen with MongoDB backed courseware. They store things like the info page
as HTML snippets which are orphaned from other content.
2013-01-08 13:45:13 -05:00
David Ormsbee
fc0a7614bf
Load courses in dir name order, keep separate ParentTracker per course.
2013-01-08 13:38:22 -05:00
Diana Huang
19401f29d9
Minor javascript updates
2013-01-08 10:22:07 -05:00
Diana Huang
3f254fc3c7
Merge branch 'master' into diana/peer-grading-views
2013-01-07 15:57:39 -05:00
Diana Huang
02247172a2
Fix some interstitial page CSS
2013-01-07 15:55:14 -05:00
Diana Huang
bbc5cd50bc
Add in default value for MOCK_PEER_GRADING
2013-01-07 15:49:48 -05:00
Diana Huang
b7473f8017
Make mock service return useful data
2013-01-07 15:40:01 -05:00
Victor Shnayder
1db70050ff
Merge pull request #1235 from MITx/fix/zoldak/clarify-doc
...
Clarify the syntax of the rake fasttest command
2013-01-07 12:29:11 -08:00
Jay Zoldak
d3fd6ac151
Clarify the syntax of the rake fasttest command
2013-01-07 15:23:08 -05:00
Diana Huang
e1ec4eec71
Get tests to pass by creating a mock peer grading service
2013-01-07 14:46:32 -05:00
Victor Shnayder
e428e9cb2a
Merge pull request #1234 from MITx/fix/zoldak/clarify-doc
...
Clarify that you need to start up the mongo daemon
2013-01-07 11:19:27 -08:00
Jay Zoldak
0c6e8c4820
Clarify that you need to start up the mongo daemon
2013-01-07 14:08:18 -05:00
Carlos Andrés Rocha
60f5089941
Merge pull request #1231 from MITx/content/rocha/job-page-update
...
Fix typos in job and faq pages
2013-01-07 07:31:48 -08:00
Carlos Andrés Rocha
56f1c6aad9
Fixed extra characters in faq page
2013-01-07 10:14:00 -05:00
Robert Chirwa
faa2373256
Fix typo in the job page
...
Signed-off-by: Carlos Andrés Rocha <rocha@edx.org >
2013-01-07 10:08:16 -05:00
Diana Huang
2293a37f7d
Move over old Staff Grading tests to new app.
2013-01-07 09:17:09 -05:00
ichuang
9a0d85667c
symmath use https, no server cert verify
2013-01-05 12:29:03 -05:00
ichuang
bf3669395b
update symmath snuggletex server
2013-01-05 12:29:00 -05:00
Diana Huang
e410703e33
Minor bug fixes and improvements
2013-01-04 17:20:03 -05:00
Diana Huang
093560e859
Updates to copy and styling and a few bugfixes
2013-01-04 16:36:28 -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
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
ichuang
c555bf5a8d
fix capa to add contextualize_text for optionresponse and multiplechoice
2013-01-03 22:57:24 -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
