Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,403 Commits 1 Branch 0 Tags
c4d1b2e643aacad659076a6f6bfef8449efa72b2
Commit Graph

7403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f0f25296b2 Update documentation 2013-01-08 15:54:49 -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
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
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