Commits · 1cf8326b323db42834ee1f7dcf9426cac618f282 · edx / edx-platform · GitLab

07 Feb, 2013 32 commits
- Make status bar, minor CSS fixes · 1cf8326b
  Vik Paruchuri committed Feb 07, 2013
  
  1cf8326b Browse Files
- Fix prompt UI in combined open ended to close by default and be collapsible · b1726dae
  Vik Paruchuri committed Feb 07, 2013
  
  b1726dae Browse Files
- Fix peer and staff grading interfaces · 5ef4af5a
  Vik Paruchuri committed Feb 07, 2013
  
  5ef4af5a Browse Files
- Make staff grading interface much nicer · ade44c33
  Vik Paruchuri committed Feb 07, 2013
  
  ade44c33 Browse Files
- Add collapse action into staff grading view · baba8d3a
  Vik Paruchuri committed Feb 07, 2013
  
  baba8d3a Browse Files
- Fix JS, style student response box · 3457b86b
  Vik Paruchuri committed Feb 07, 2013
  
  3457b86b Browse Files
- Restyle rubric list, submission container · c195fe65
  Vik Paruchuri committed Feb 07, 2013
  
  c195fe65 Browse Files
- Move elements around, do some restyling · 198885f7
  Vik Paruchuri committed Feb 07, 2013
  
  198885f7 Browse Files
- Feedback and view only rubric restyle · aa699905
  Vik Paruchuri committed Feb 07, 2013
  
  aa699905 Browse Files
- Re-arrange feedback, fix rubric HTML issue · f22849eb
  Vik Paruchuri committed Feb 07, 2013
  
  f22849eb Browse Files
- Work on showing results properly · b30407d7
  Vik Paruchuri committed Feb 07, 2013
  
  b30407d7 Browse Files
- Change around some names, restyle rubric · de8e1e94
  Vik Paruchuri committed Feb 07, 2013
  
  de8e1e94 Browse Files
- Restyle status, get rubric to work properly · 03a6572b
  Vik Paruchuri committed Feb 07, 2013
  
  03a6572b Browse Files
- Revert peer grading problem to master version · 9a5a9881
  Vik Paruchuri committed Feb 07, 2013
  
  9a5a9881 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/improve-oe-ui · 2542b6cb
  Vik Paruchuri committed Feb 07, 2013
  
  2542b6cb Browse Files
- Alter rubric list, restyle rubric · 6a6962df
  Vik Paruchuri committed Feb 07, 2013
  
  6a6962df Browse Files
- Merge pull request #1455 from MITx/hotfix/dave/youtube_object · a6b35853
```
Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue.
```
  David Ormsbee committed Feb 06, 2013
  a6b35853 Browse Files
- Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue. · 97677664
  David Ormsbee committed Feb 06, 2013
  
  97677664 Browse Files
- Merge pull request #1454 from MITx/hotfix/dave/youtube_object · 37b735d7
```
Hack to disable YouTube <iframe> API when they break it.
```
  Victor Shnayder committed Feb 06, 2013
  37b735d7 Browse Files
- Hack to disable YouTube <iframe> API when they break it. · a470a62d
  David Ormsbee committed Feb 06, 2013
  
  a470a62d Browse Files
- Merge pull request #1453 from MITx/victor/protex · 18ddd1ee
```
Victor/protex
```
  Victor Shnayder committed Feb 06, 2013
  18ddd1ee Browse Files
- Protex now loads correctly in every scenario · 2627a2f1
  jmclaus committed Feb 06, 2013
  
  2627a2f1 Browse Files
- Loading bug fixed by ugly hack · 98865bb7
  jmclaus committed Feb 06, 2013
  
  98865bb7 Browse Files
- GWT now does no set any target shape in onModuleLoad() · 85b92f30
  jmclaus committed Feb 06, 2013
  
  85b92f30 Browse Files
- Fixed small alighment pb, decreased font size of text box · e27b1e04
  jmclaus committed Feb 06, 2013
  
  e27b1e04 Browse Files
- Crisper AA letters, canvases non-selectable · 3bd7e1b7
  jmclaus committed Feb 06, 2013
  
  3bd7e1b7 Browse Files
- Few bug fixes · ef232c59
  jmclaus committed Feb 06, 2013
  
  ef232c59 Browse Files
- Fixed layout, increased size of markers on proteins · f6dacff4
  jmclaus committed Feb 06, 2013
  
  f6dacff4 Browse Files
- Added GWT Protex - reads target shape from xml writes answer to hidden input field · 5737f58b
  jmclaus committed Feb 06, 2013
  
  5737f58b Browse Files
- Merge pull request #1452 from MITx/silly/victor/revert-forums-merge · e4819a1b
```
Silly/victor/revert forums merge
```
  Victor Shnayder committed Feb 06, 2013
  e4819a1b Browse Files
- Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes" · 2af06ef1
```
This reverts commit 66889b87, reversing
changes made to 0dd9c24e.

This was merged too early--it's still missing the filtering and display-your-cohort changes.
Will need to revert this revert later.
```
  Victor Shnayder committed Feb 06, 2013
  2af06ef1 Browse Files
- Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes" · 884a7a61
```
This reverts commit 965e3b4c, reversing
changes made to 1a7d2a06.

I accidentally merged this before it was ready.  This was silly, so now I'm undoing it.  We'll need to revert the revert later.
```
  Victor Shnayder committed Feb 06, 2013
  884a7a61 Browse Files
06 Feb, 2013 8 commits
- Merge pull request #1432 from MITx/7012x-clean · b6ec41ca
```
7012x clean
```
  Victor Shnayder committed Feb 06, 2013
  b6ec41ca Browse Files
- add warning message to sample-post.py · 0141f31d
  Victor Shnayder committed Feb 06, 2013
  
  0141f31d Browse Files
- Merge remote-tracking branch 'origin/master' into 7012x-clean · edf96036
  Victor Shnayder committed Feb 06, 2013
  
  edf96036 Browse Files
- Merge pull request #1449 from MITx/fix/rocha/7012x-clean · 2c1f3bd4
```
Fix/rocha/7012x clean
```
  Victor Shnayder committed Feb 06, 2013
  2c1f3bd4 Browse Files
- Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes · 965e3b4c
```
addressed somme comments in pull request and instructor fixes and blank ...
```
  Victor Shnayder committed Feb 06, 2013
  965e3b4c Browse Files
- Refactor how editamolecule displays messages · 536333cb
  Carlos Andrés Rocha committed Feb 06, 2013
  
  536333cb Browse Files
- addressed somme comments in pull request and instructor fixes and blank group fix · 1dd0ef27
  Kevin Chugh committed Feb 06, 2013
  
  1dd0ef27 Browse Files
- Merge pull request #1442 from MITx/marketing/reg-tweak · 1a7d2a06
```
Fix placeholder email in signup form
```
  Victor Shnayder committed Feb 06, 2013
  1a7d2a06 Browse Files