Commits · 2318ce18c408b16903fcb6013ccd3c719f60d83f · edx / edx-platform · GitLab

10 Apr, 2014 6 commits
- Merge pull request #3217 from edx/ammar/convert-lettuce-video-tests-to-bok-choy · 2318ce18
```
Convert lettuce video tests to bok choy
```
  muhammad-ammar committed Apr 10, 2014
  2318ce18 Browse Files
- Merge pull request #2440 from glowe/prevent-duplicate-checks · 15a49f87
```
Temporarily disable CAPA problem "Check" button.
```
  David Baumgold committed Apr 10, 2014
  15a49f87 Browse Files
- Convert first batch of lettuce video tests to bok-choy. · 5b6f3f8f
  Muhammad Ammar committed Apr 10, 2014
  
  5b6f3f8f Browse Files
- Merge pull request #3297 from edx/merge-release-into-master · 3fd89a0d
```
Merge release into master
```
  Adam committed Apr 10, 2014
  3fd89a0d Browse Files
- Merge pull request #3289 from edx/zoldak/quiet-acceptance-test-logs · 2c500a2b
```
Quiet some noisy loggers for lettuce acceptance tests
```
  Jay Zoldak committed Apr 10, 2014
  2c500a2b Browse Files
- Merge pull request #2981 from edx/andya/container-editing · 8059547e
```
Add "Edit" button to each leaf xblock on the container page
```
  Andy Armstrong committed Apr 10, 2014
  8059547e Browse Files
09 Apr, 2014 34 commits
- Merge pull request #3183 from edx/gprice/inline-response-pagination · 8c8367b0
```
Add repsonse pagination to inline discussions
```
  Greg Price committed Apr 09, 2014
  8c8367b0 Browse Files
- Merge pull request #3298 from edx/markhoeber/documentation/doc-79 · 8609345b
```
Fixed typo in drag & drop
```
  Mark Hoeber committed Apr 09, 2014
  8609345b Browse Files
- Fixed typo in drag & drop · 581702e1
```
numbers -> number
```
  Mark Hoeber committed Apr 09, 2014
  581702e1 Browse Files
- Merge remote-tracking branch 'origin/release' into merge-release-into-master · b34c46dd
  Adam Palay committed Apr 09, 2014
  
  b34c46dd Browse Files
- Add bok-choy tests for inline response pagination · 16847d85
  Greg Price committed Apr 09, 2014
  
  16847d85 Browse Files
- addressing review feedback · df0973e7
  Frances Botsford committed Apr 09, 2014
  
  df0973e7 Browse Files
- Merge pull request #3282 from edx/hotfix/2014-04-09 · 0fb3a7d2
```
Hotfix 2014-04-09
```
  Adam committed Apr 09, 2014
  0fb3a7d2 Browse Files
- Merge pull request #3281 from edx/zoldak/fix-video-feature-name · 66a86858
```
Fix video feature name so the test results roll up correctly
```
  Jay Zoldak committed Apr 09, 2014
  66a86858 Browse Files
- Quiet some noisy loggers for lettuce acceptance tests · 579e66fe
  Jay Zoldak committed Apr 09, 2014
  
  579e66fe Browse Files
- Merge pull request #3286 from edx/markhoeber/documentation/doc-254 · 430827d3
```
Removal of JS input chapter
```
  Mark Hoeber committed Apr 09, 2014
  430827d3 Browse Files
- Removal of JS input chapter · 0abedac3
```
DOC-254
```
  Mark Hoeber committed Apr 09, 2014
  0abedac3 Browse Files
- Remove feature flag for testing on container pages · 2bf64d76
  Andy Armstrong committed Apr 09, 2014
  
  2bf64d76 Browse Files
- Indicate LaTex problems with a specific class on the editor · b78508a1
  Andy Armstrong committed Apr 09, 2014
  
  b78508a1 Browse Files
- Implement next round of code reviews · a3e26e68
  Andy Armstrong committed Apr 09, 2014
  
  a3e26e68 Browse Files
- Merge pull request #3266 from edx/sylvia/documentation/DOC-265 · 7154ecca
```
Add info about accessing student progress through steps
```
  srpearce committed Apr 09, 2014
  7154ecca Browse Files
- Document Course Staff Information field · 7c8dbcf5
  Sylvia Pearce committed Apr 09, 2014
  
  7c8dbcf5 Browse Files
- Make the LaText source compiler link visible · d55ad618
  Andy Armstrong committed Apr 09, 2014
  
  d55ad618 Browse Files
- Merge pull request #3246 from edx/anton/i18n-lti · a84bca23
```
LTI i18n 
```
  Anton Stupak committed Apr 09, 2014
  a84bca23 Browse Files
- Change behavior of cohort addition interface · 5f337df6
```
Instead of noting users that are already in a cohort and not changing
such users, clobber the previous cohort and display a message indicating
the previous cohort membership.

JIRA: FOR-452
```
  Greg Price committed Apr 09, 2014
  5f337df6 Browse Files
- Improve unit testing of xblock editing · 2ae28c5d
  Andy Armstrong committed Apr 09, 2014
  
  2ae28c5d Browse Files
- Fix typo in textbook_spec.js · 9de6f101
  Andy Armstrong committed Apr 09, 2014
  
  9de6f101 Browse Files
- Address the next round of review comments. · a6aae729
  Andy Armstrong committed Apr 09, 2014
  
  a6aae729 Browse Files
- Rebuild the way modals are constructed to support nesting. · 88d95d11
  Andy Armstrong committed Apr 09, 2014
  
  88d95d11 Browse Files
- Add unit tests for custom tabs and modal titles · b779b8a6
  Andy Armstrong committed Apr 09, 2014
  
  b779b8a6 Browse Files
- Try to fix the failing JavaScript test · 5ab159b0
  Andy Armstrong committed Apr 09, 2014
  
  5ab159b0 Browse Files
- Add more improvements from the review. · 230c0b5b
  Andy Armstrong committed Apr 09, 2014
  
  230c0b5b Browse Files
- removed commented out lines · b23f17db
  Frances Botsford committed Apr 09, 2014
  
  b23f17db Browse Files
- Fix up edit_component so that it doesn't take an unnecessary step argument · 07c54dcb
  Andy Armstrong committed Apr 09, 2014
  
  07c54dcb Browse Files
- Clean up the logic for the edit modal's title · 415fe8d3
  Andy Armstrong committed Apr 09, 2014
  
  415fe8d3 Browse Files
- Changes based upon code review comments · dce075a8
  Andy Armstrong committed Apr 09, 2014
  
  dce075a8 Browse Files
- fixed mixin sass · e18dd7f5
  Frances Botsford committed Apr 09, 2014
  
  e18dd7f5 Browse Files
- Fix unit tests · 052949d7
  Andy Armstrong committed Apr 09, 2014
  
  052949d7 Browse Files
- removed edit-dialog and uploads css, changed component edit icon to pencil, small css fixes · ee42902e
  Frances Botsford committed Apr 09, 2014
  
  ee42902e Browse Files
- small ui fixes in Studio - textbooks upload and loading font-size · 636fa190
  Frances Botsford committed Apr 09, 2014
  
  636fa190 Browse Files