Commits · 3f254fc3c734913868a8eae343ba7e53dae930f7 · edx / edx-platform · GitLab

07 Jan, 2013 13 commits
- Merge branch 'master' into diana/peer-grading-views · 3f254fc3
  Diana Huang committed Jan 07, 2013
  
  3f254fc3 Browse Files
- Fix some interstitial page CSS · 02247172
  Diana Huang committed Jan 07, 2013
  
  02247172 Browse Files
- Add in default value for MOCK_PEER_GRADING · bbc5cd50
  Diana Huang committed Jan 07, 2013
  
  bbc5cd50 Browse Files
- Make mock service return useful data · b7473f80
  Diana Huang committed Jan 07, 2013
  
  b7473f80 Browse Files
- Merge pull request #1235 from MITx/fix/zoldak/clarify-doc · 1db70050
```
Clarify the syntax of the rake fasttest command
```
  Victor Shnayder committed Jan 07, 2013
  1db70050 Browse Files
- Clarify the syntax of the rake fasttest command · d3fd6ac1
  Jay Zoldak committed Jan 07, 2013
  
  d3fd6ac1 Browse Files
- Get tests to pass by creating a mock peer grading service · e1ec4eec
  Diana Huang committed Jan 07, 2013
  
  e1ec4eec Browse Files
- Merge pull request #1234 from MITx/fix/zoldak/clarify-doc · e428e9cb
```
Clarify that you need to start up the mongo daemon
```
  Victor Shnayder committed Jan 07, 2013
  e428e9cb Browse Files
- Clarify that you need to start up the mongo daemon · 0c6e8c48
  Jay Zoldak committed Jan 07, 2013
  
  0c6e8c48 Browse Files
- Merge pull request #1231 from MITx/content/rocha/job-page-update · 60f50899
```
Fix typos in job and faq pages
```
  Carlos Andrés Rocha committed Jan 07, 2013
  60f50899 Browse Files
- Fixed extra characters in faq page · 56f1c6aa
  Carlos Andrés Rocha committed Jan 07, 2013
  
  56f1c6aa Browse Files
- Fix typo in the job page · faa23732
```
Signed-off-by: Carlos Andrés Rocha <rocha@edx.org>
```
  Robert Chirwa committed Jan 07, 2013
  faa23732 Browse Files
- Move over old Staff Grading tests to new app. · 2293a37f
  Diana Huang committed Jan 07, 2013
  
  2293a37f Browse Files
04 Jan, 2013 9 commits
- Minor bug fixes and improvements · e410703e
  Diana Huang committed Jan 04, 2013
  
  e410703e Browse Files
- Updates to copy and styling and a few bugfixes · 093560e8
  Diana Huang committed Jan 04, 2013
  
  093560e8 Browse Files
- Add interstitial page between calibration and grading. · fa09e25a
```
Make individual Prompt and Rubric Sections hideable.
```
  Diana Huang committed Jan 04, 2013
  fa09e25a Browse Files
- Improvements to calibration feedback step · befe36f6
  Diana Huang committed Jan 04, 2013
  
  befe36f6 Browse Files
- Minor updates to the page to handle showing Calibration feedback. · ad63c492
```
Also, allow for the hiding of the Prompt and the Rubric.
```
  Diana Huang committed Jan 04, 2013
  ad63c492 Browse Files
- Merge branch 'master' into diana/peer-grading-views · d2228205
  Diana Huang committed Jan 04, 2013
  
  d2228205 Browse Files
- Show special text when calibrating or when grading. · b5f34a9d
  Diana Huang committed Jan 04, 2013
  
  b5f34a9d Browse Files
- Merge pull request #1228 from MITx/content/rocha/media-kit · d0221808
```
Add new tab/window behavior to media kit
```
  Carlos Andrés Rocha committed Jan 04, 2013
  d0221808 Browse Files
- media kit - added in new tab/window behavior for download links, revised edX… · 04524ef5
```
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
```
  Brian Talbot committed Jan 04, 2013
  04524ef5 Browse Files
03 Jan, 2013 18 commits
- Merge pull request #1226 from MITx/content/rocha/media-kit · 95e7f2f1
```
Fix error in one of the media kit assets URLs
```
  Carlos Andrés Rocha committed Jan 03, 2013
  95e7f2f1 Browse Files
- Fix error in one of the media kit assets URLs · 59f4962c
  Carlos Andrés Rocha committed Jan 03, 2013
  
  59f4962c Browse Files
- Merge pull request #1225 from MITx/content/rocha/media-kit · c3d7bbe0
```
Minor style changes to home page and media kit page

[Finishes #41872203]
```
  Carlos Andrés Rocha committed Jan 03, 2013
  c3d7bbe0 Browse Files
- Minor style changes to home page and media kit page · 25cb6d5a
```
[#41872203]
```
  Carlos Andrés Rocha committed Jan 03, 2013
  25cb6d5a Browse Files
- Merge pull request #1224 from MITx/content/rocha/media-kit · 67dea0c3
```
Add media kit page
```
  David Ormsbee committed Jan 03, 2013
  67dea0c3 Browse Files
- Bug fixes for the JS and the peer grading service · fe86c25f
  Diana Huang committed Jan 03, 2013
  
  fe86c25f Browse Files
- Fix link to root page on the main page footer · 2e6ac2f7
  Carlos Andrés Rocha committed Jan 03, 2013
  
  2e6ac2f7 Browse Files
- media kit - added initial styles to media kit page · a67b54bf
  Brian Talbot committed Jan 03, 2013
  
  a67b54bf Browse Files
- Merge branch 'master' into diana/peer-grading-views · 28501ca5
  Diana Huang committed Jan 03, 2013
  
  28501ca5 Browse Files
- Fix up some minor state issues and · 078b2a5b
```
complete basic JS functionality for page
```
  Diana Huang committed Jan 03, 2013
  078b2a5b Browse Files
- media kit - revised link styling on homepage · e10e87e6
  Brian Talbot committed Jan 03, 2013
  
  e10e87e6 Browse Files
- Updated html and javascript for new pages as well · becffd4d
```
as a fix for the peer grading service
```
  Diana Huang committed Jan 03, 2013
  becffd4d Browse Files
- Update some of the templates so that they don't break · c0001597
  Diana Huang committed Jan 03, 2013
  
  c0001597 Browse Files
- Pass location as a parameter, not as a part of the url · 1c1034c6
  Diana Huang committed Jan 03, 2013
  
  1c1034c6 Browse Files
- Add content and assets for media kit · bd0a2f66
```
[# 41872203]
```
  Carlos Andrés Rocha committed Jan 03, 2013
  bd0a2f66 Browse Files
- Merge pull request #1132 from MITx/vik/modify_open_ended · 559bf887
```
Vik/modify open ended
```
  David Ormsbee committed Jan 03, 2013
  559bf887 Browse Files
- Display a message when there are no problems to grade · 962d83d7
  Diana Huang committed Jan 03, 2013
  
  962d83d7 Browse Files
- New urls and corresponding views in the grading service · bd47b0c7
  Diana Huang committed Jan 03, 2013
  
  bd47b0c7 Browse Files