Commits · 5029d3a3ddf674b64d8860eed195ccac038bf9c7 · edx / edx-platform · GitLab

06 Mar, 2013 6 commits
- Merge branch 'feature/vik/advanced-studio' into feature/abarrett/annotatable_xmodule · 5029d3a3
  Arthur Barrett committed Mar 06, 2013
  
  5029d3a3 Browse Files
- fixed highlight style for cascade. · fd49aceb
  Arthur Barrett committed Mar 06, 2013
  
  fd49aceb Browse Files
- tweaked commentary textarea size so it looks correct in ff · 9b32400b
  Arthur Barrett committed Mar 06, 2013
  
  9b32400b Browse Files
- show the annotation callout at the span center rather than at the mouse · 0424b533
  Arthur Barrett committed Mar 06, 2013
  
  0424b533 Browse Files
- set a default height on the commentary textbox to show 5 lines of text · 3393e638
  Arthur Barrett committed Mar 06, 2013
  
  3393e638 Browse Files
- visually distinguish instructions from guided discussion section · 2ed7394f
  Arthur Barrett committed Mar 06, 2013
  
  2ed7394f Browse Files
05 Mar, 2013 7 commits
- Remove string and old import · 102c594e
  Vik Paruchuri committed Mar 05, 2013
  
  102c594e Browse Files
- Address review comments · 9475c6ed
  Vik Paruchuri committed Mar 05, 2013
  
  9475c6ed Browse Files
- Advanced modules must now be specified individually in order to enable them on… · 5bbb70ef
```
Advanced modules must now be specified individually in order to enable them on the 'advanced' component menu.
```
  Arthur Barrett committed Mar 05, 2013
  5bbb70ef Browse Files
- updated CSS to use the new advanced icon · c9b2a6a2
  Arthur Barrett committed Mar 05, 2013
  
  c9b2a6a2 Browse Files
- merged openended and advanced categories per discussion at today's standup · fa3961d4
  Arthur Barrett committed Mar 05, 2013
  
  fa3961d4 Browse Files
- studio - advanced modules: added in advanced module button icon per artie/vik work · ef9f963f
  Brian Talbot committed Mar 05, 2013
  
  ef9f963f Browse Files
- Small metadata naming fix · d03fe79e
  Vik Paruchuri committed Mar 05, 2013
  
  d03fe79e Browse Files
04 Mar, 2013 4 commits
- annotation now hides automatically on mouseleave events. click to hide/show or… · 7a0aead0
```
annotation now hides automatically on mouseleave events. click to hide/show or re-position the annotation.
```
  Arthur Barrett committed Mar 04, 2013
  7a0aead0 Browse Files
- studio - open ended and annotations: added in component button icon assets and styling · cc3b9557
  Brian Talbot committed Mar 04, 2013
  
  cc3b9557 Browse Files
- style the guided discussion text so it is boxed like the instructions text. · b0abfa07
  Arthur Barrett committed Mar 04, 2013
  
  b0abfa07 Browse Files
- constrain the annotation call-out horizontally so it is always visible in the window · 2e6115c7
  Arthur Barrett committed Mar 04, 2013
  
  2e6115c7 Browse Files
01 Mar, 2013 23 commits
- Add in a todo · 7ee58fb2
  Vik Paruchuri committed Mar 01, 2013
  
  7ee58fb2 Browse Files
- Removing failing jasmine tests for now. · 20174fd2
  Arthur Barrett committed Mar 01, 2013
  
  20174fd2 Browse Files
- Fix the way that peer grading tab is initialized to make it work with studio · 55e19f82
  Vik Paruchuri committed Mar 01, 2013
  
  55e19f82 Browse Files
- Fix some xml issues in yaml · 4400f941
  Vik Paruchuri committed Mar 01, 2013
  
  4400f941 Browse Files
- Change name of annotatable, add in sass for advanced module · f8b0338d
  Vik Paruchuri committed Mar 01, 2013
  
  f8b0338d Browse Files
- Make parsing more robust · a2c03fec
  Vik Paruchuri committed Mar 01, 2013
  
  a2c03fec Browse Files
- Json parsing fixes · 7a8e43a9
  Vik Paruchuri committed Mar 01, 2013
  
  7a8e43a9 Browse Files
- Apparently meld is weird at indenting · 386ab10e
  Vik Paruchuri committed Mar 01, 2013
  
  386ab10e Browse Files
- Fix category generation · a09a4feb
  Vik Paruchuri committed Mar 01, 2013
  
  a09a4feb Browse Files
- Minor bugfixes · fb37d46b
  Vik Paruchuri committed Mar 01, 2013
  
  fb37d46b Browse Files
- Merge branch 'feature/vik/studio-oe' into feature/vik/advanced-studio · d0397762
```
Conflicts:
	cms/djangoapps/contentstore/views.py
```
  Vik Paruchuri committed Mar 01, 2013
  d0397762 Browse Files
- added advanced component button with ability to specify components in course policy. · 67b73242
  Arthur Barrett committed Mar 01, 2013
  
  67b73242 Browse Files
- Add in some dummy values · 9f020e22
  Vik Paruchuri committed Mar 01, 2013
  
  9f020e22 Browse Files
- Prelim support for combinedopenended and peergrading types · a8181912
  Vik Paruchuri committed Mar 01, 2013
  
  a8181912 Browse Files
- adding annotatable module template · 53005103
  Arthur Barrett committed Mar 01, 2013
  
  53005103 Browse Files
- Move self assessment templates · c24ba23e
  Vik Paruchuri committed Mar 01, 2013
  
  c24ba23e Browse Files
- Switch around template locations · b0c2559d
  Vik Paruchuri committed Mar 01, 2013
  
  b0c2559d Browse Files
- start adding jasmine tests to module · 82544f2a
  Arthur Barrett committed Mar 01, 2013
  
  82544f2a Browse Files
- enable studio authoring (raw) for xmodule · 6dba2394
  Arthur Barrett committed Mar 01, 2013
  
  6dba2394 Browse Files
- Start to move around templates · b3d0abbd
  Vik Paruchuri committed Mar 01, 2013
  
  b3d0abbd Browse Files
- Merge pull request #1538 from MITx/diana/fix-import-export · d186e5d1
```
Fix studio import and export for CombinedOpenEnded, PeerGrading XModules
```
  VikParuchuri committed Mar 01, 2013
  d186e5d1 Browse Files
- Merge pull request #1575 from MITx/feature/edz/lock-requirements · 3908ada4
```
locking django-nose and numpy versions
```
  Calen Pennington committed Mar 01, 2013
  3908ada4 Browse Files
- locking django-nose and numpy versions · a3ed2d15
  e0d committed Mar 01, 2013
  
  a3ed2d15 Browse Files