Commits · 5ec39825e0d3b3d58a84cec961bc613c4cf322bf · edx / edx-platform · GitLab

07 Mar, 2013 5 commits
- Merge pull request #1604 from MITx/hotfix/jkarni/folditscore · 5ec39825
```
Hotfix/jkarni/folditscore
```
  Victor Shnayder committed Mar 06, 2013
  5ec39825 Browse Files
- Merge pull request #1613 from MITx/victor/fix-blank-capa · 6af857b3
```
Fix max_attempts=''
```
  Victor Shnayder committed Mar 06, 2013
  6af857b3 Browse Files
- Fix max_attempts='' · b6a6e10b
```
That's what studio defaults to, and recent changes made it break.
Added a few tests to make sure it doesn't happen again.
```
  Victor Shnayder committed Mar 06, 2013
  b6a6e10b Browse Files
- Merge pull request #1612 from MITx/victor/fix-genex-css · 28e300c0
```
remove links to missing image files.  We can add them if needed later.
```
  John Hess committed Mar 06, 2013
  28e300c0 Browse Files
- remove links to missing image files. We can add them if needed later. · 57700a56
  Victor Shnayder committed Mar 06, 2013
  
  57700a56 Browse Files
06 Mar, 2013 35 commits
- Merge pull request #1597 from MITx/docs/valera/drag_and_drop · 5b12793a
```
Added documentation for drag and drop - targets on draggables feature.
```
  David Ormsbee committed Mar 06, 2013
  5b12793a Browse Files
- Merge pull request #1611 from MITx/fix/brian/doc-pdfbook · d2f9b27d
```
add textbook and pdf textbook documentation
```
  David Ormsbee committed Mar 06, 2013
  d2f9b27d Browse Files
- add textbook and pdf textbook documentation · 9c92c92f
  Brian Wilson committed Mar 06, 2013
  
  9c92c92f Browse Files
- Merge pull request #1608 from MITx/feature/jkarni/genex · 3bb108b1
```
Feature/jkarni/genex
```
  jkarni committed Mar 06, 2013
  3bb108b1 Browse Files
- Merge pull request #1610 from MITx/fix/diana/fix-annotation-tests · 73bca8af
```
Update correctmap to handle partially correct answers, and
```
  Jay Zoldak committed Mar 06, 2013
  73bca8af Browse Files
- Update correctmap to handle partially correct answers, and · 5c3dfd92
```
fix annotation tests so that they use the new test_system functionality
```
  Diana Huang committed Mar 06, 2013
  5c3dfd92 Browse Files
- Merge pull request #1607 from MITx/feature/christina/djdebug · 05211d4f
```
Enable Django debug toolbar on Studio (including Mongo panel).
```
  chrisndodge committed Mar 06, 2013
  05211d4f Browse Files
- Merge pull request #1609 from MITx/diana/refactor-chemical-equation · 12b6b7d4
```
Refactor Chemical Equation Preview
```
  Victor Shnayder committed Mar 06, 2013
  12b6b7d4 Browse Files
- Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule · fb350ed1
```
Feature/abarrett/annotatable xmodule DO NOT MERGE
```
  Victor Shnayder committed Mar 06, 2013
  fb350ed1 Browse Files
- Update tests and documentation. · 42e711e7
  Diana Huang committed Mar 06, 2013
  
  42e711e7 Browse Files
- Add 'get' default string · fb08942b
  Julian Arni committed Mar 06, 2013
  
  fb08942b Browse Files
- Switch over to using the inputtype ajax handler for chemical input. · 1aa3580d
  Diana Huang committed Mar 06, 2013
  
  1aa3580d Browse Files
- fixed typo · dfc9176f
  Arthur Barrett committed Mar 06, 2013
  
  dfc9176f Browse Files
- Added instructions/documentation to the studio template for content authors. · ddbab364
  Arthur Barrett committed Mar 06, 2013
  
  ddbab364 Browse Files
- Merge pull request #1598 from MITx/diana/capa-input-ajax · 7af36eb6
```
Give InputTypes the ability to handle their own AJAX
```
  Victor Shnayder committed Mar 06, 2013
  7af36eb6 Browse Files
- Enable Django debug toolbar on Studio (including Mongo panel). · de225e66
  cahrens committed Mar 06, 2013
  
  de225e66 Browse Files
- 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
- Merge branch 'master' into feature/jkarni/genex · d05e82e3
  Julian Arni committed Mar 06, 2013
  
  d05e82e3 Browse Files
- tweaked commentary textarea size so it looks correct in ff · 9b32400b
  Arthur Barrett committed Mar 06, 2013
  
  9b32400b Browse Files
- Merge pull request #1605 from MITx/bug/christina/misc · 69601047
```
Use readonly attribute instead of disabled. Disabled text fields are not...
```
  Don Mitchell committed Mar 06, 2013
  69601047 Browse Files
- Use readonly attribute instead of disabled. Disabled text fields are not selectable on FireFox. · b706d4a1
```
#225
```
  cahrens committed Mar 06, 2013
  b706d4a1 Browse Files
- Make exception a little more specific · dfa590e7
  Julian Arni committed Mar 06, 2013
  
  dfa590e7 Browse Files
- Fix indendation that was causing only first submission to be saved · 5682e02f
  Julian Arni committed Mar 06, 2013
  
  5682e02f Browse Files
- Fix a bug in extracting HTML · 4b7d1deb
```
Update tests to reflect new behavior.
```
  Diana Huang committed Mar 06, 2013
  4b7d1deb Browse Files
- Remove unnecessary import. · 455dea87
  Diana Huang committed Mar 06, 2013
  
  455dea87 Browse Files
- Fix some of the tests so that they work with the new changes · 78424e16
```
to capa_problem
```
  Diana Huang committed Mar 06, 2013
  78424e16 Browse Files
- More comments. · 17680a33
  Diana Huang committed Mar 06, 2013
  
  17680a33 Browse Files
- Add more documentation and fix naming. · 9b640aa0
  Diana Huang committed Mar 06, 2013
  
  9b640aa0 Browse Files
- Handle multiple inputs properly for ajax handling. · 385a62d7
  Diana Huang committed Mar 06, 2013
  
  385a62d7 Browse Files
- Fix test rendering so we can parse the problem during tests without it breaking. · 6f535d9e
  Diana Huang committed Mar 06, 2013
  
  6f535d9e Browse Files
- Add the ability to make ajax calls on the input type of capa problems. · 9545a82a
  Diana Huang committed Mar 06, 2013
  
  9545a82a Browse Files
- Merge pull request #1602 from MITx/fix/will/capa_xmodule_unit_tests · f8adfc62
```
Fix/will/capa xmodule unit tests
```
  Diana Huang committed Mar 06, 2013
  f8adfc62 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