Commits · 08eb8fa7c19eaff4870cd0bea6d06a80915000eb · edx / edx-platform

14 May, 2014 5 commits
- Merge pull request #3706 from edx/adam/fix-non-ascii-grade-range · 08eb8fa7
```
Adam/fix non ascii grade range
```
  Adam committed May 14, 2014
  08eb8fa7 Browse Files
- Merge pull request #3719 from edx/markhoeber/documentation/change-log-fix · ba7171b0
```
May change log fix
```
  Mark Hoeber committed May 14, 2014
  ba7171b0 Browse Files
- May change log fix · f321d7a8
  Mark Hoeber committed May 14, 2014
  
  f321d7a8 Browse Files
- Merge pull request #3714 from edx/waheed/lms1596-change-text-admin-dash · df3d6e3b
```
Text changed in admin_dashboard for course enrollments.
```
  Waheed Ahmed committed May 14, 2014
  df3d6e3b Browse Files
- Text changed in admin_dashboard for course enrollments. · 2b8fafec
```
LMS-1596
```
  Waheed Ahmed committed May 14, 2014
  2b8fafec Browse Files
13 May, 2014 24 commits
- Merge pull request #3710 from edx/db/add-to-authors-file · f8f542b6
```
Added @ksteph to AUTHORS file
```
  David Baumgold committed May 13, 2014
  f8f542b6 Browse Files
- Added @ksteph to AUTHORS file · c6ea63d3
```
See https://github.com/edx/edx-platform/pull/506
```
  David Baumgold committed May 13, 2014
  c6ea63d3 Browse Files
- Merge pull request #3696 from edx/talbs/fix-lms-dashboard-images · 2c9a7b51
```
FIX - LMS: Dashboard Course Image Dimensions
```
  Brian Talbot committed May 13, 2014
  2c9a7b51 Browse Files
- resolving display issue where older/smaller courses images wouldn't fill… · cd1ec5fd
```
resolving display issue where older/smaller courses images wouldn't fill designated area on the student dashboard
```
  Brian Talbot committed May 13, 2014
  cd1ec5fd Browse Files
- Merge pull request #3700 from edx/andya/split_test_has_children · 07311544
```
Specify that split_test_modules support children.
```
  Andy Armstrong committed May 13, 2014
  07311544 Browse Files
- fix bug · 9b313d73
  Adam Palay committed May 13, 2014
  
  9b313d73 Browse Files
- add failing tests for non-ascii characters in grade cutoffs on progress page (LMS-2687) · 2b95b0ba
  Adam Palay committed May 13, 2014
  
  2b95b0ba Browse Files
- Merge pull request #3697 from edx/e0d/revert-mysql-upgrade · 9407102b
```
reverting the upgrade
```
  e0d committed May 13, 2014
  9407102b Browse Files
- Specify that split_test_modules support children. · 4adc608f
  Andy Armstrong committed May 13, 2014
  
  4adc608f Browse Files
- Merge pull request #3695 from edx/sylvia/docs/DOC-359 · 0a51b2ad
```
Sylvia/docs/doc 359
```
  srpearce committed May 13, 2014
  0a51b2ad Browse Files
- Update Vital Source and LTI component information · c6f80bff
  Sylvia Pearce committed May 13, 2014
  
  c6f80bff Browse Files
- Merge branch 'release' · dcf27a9b
  Brian Wilson committed May 13, 2014
  
  dcf27a9b Browse Files
- Merge branch 'master' into release · d6a74a64
```
Conflicts:
	cms/static/js/views/modals/edit_xblock.js
```
  Brian Wilson committed May 13, 2014
  d6a74a64 Browse Files
- Merge pull request #3685 from edx/sarina/051314-language-update · 209c0d70
```
Update translations (autogenerated message)
```
  Sarina Canelake committed May 13, 2014
  209c0d70 Browse Files
- reverting the upgrade · eced86d6
  e0d committed May 13, 2014
  
  eced86d6 Browse Files
- Merge branch 'shindere/fix-debug-toolbar-lms' for PR #3401 · 09e3a86d
  David Baumgold committed May 13, 2014
  
  09e3a86d Browse Files
- Add myself to AUTHORS. · 7c078e04
  Sébastien Hinderer committed May 13, 2014
  
  7c078e04 Browse Files
- CMS: debug toolbar should be displayed on dev stack. · ec31a426
```
In Studio, the debug tool bar did not appear as in LMS.
```
  Sébastien Hinderer committed May 13, 2014
  ec31a426 Browse Files
- Merge pull request #3585 from dragonfi/master · 7a96faf9
```
Fix #3347: "Run Code" reloads page in Matlab Problem
```
  Waheed Ahmed committed May 13, 2014
  7a96faf9 Browse Files
- Update translations (autogenerated message) · 24756bdb
  Sarina Canelake committed May 13, 2014
  
  24756bdb Browse Files
- Merge pull request #3464 from mitocw/cg/course_image_fixes · eadf3b59
```
Additional logic to handle more course_image URL edge cases
```
  Carson Gee committed May 13, 2014
  eadf3b59 Browse Files
- Merge pull request #3690 from edx/ahodges/documentation/DOC326 · 489eceee
```
Added username as option for batch enrollment/unenroll
```
  Alison Hodges committed May 13, 2014
  489eceee Browse Files
- Added username as option for batch enrollment/unenroll · f3d11250
  Alison Hodges committed May 13, 2014
  
  f3d11250 Browse Files
- Merge pull request #3488 from edx/alex/paver_dev · a3004de9
```
Add dev command to run in native envs.
```
  Alexander Kryklia committed May 13, 2014
  a3004de9 Browse Files
12 May, 2014 11 commits
- Merge pull request #3677 from edx/nick/fix-feedback-bug · c30665fb
```
Fix targeted-feedback bug
```
  Nick Parlante committed May 12, 2014
  c30665fb Browse Files
- Fix targeted-feedback bug · f48e470f
```
The bug is with the case of multiple-questions with targeted
feedback within a single problem.

Refactor the targeted-feedback tests to house
the most common xml in external files.

Move the capa test load_fixture function to __init__.py so it
can be used generally.
```
  Nick Parlante committed May 12, 2014
  f48e470f Browse Files
- Merge pull request #3595 from edx/adam/fix-typo-2 · 7d6e3319
```
put google analytics in quotation marks in linkedin email template
```
  Adam committed May 12, 2014
  7d6e3319 Browse Files
- Merge pull request #3626 from edx/adam/fix-import-bug · 4ecf4112
```
fix importing bug (STUD-1599)
```
  Adam committed May 12, 2014
  4ecf4112 Browse Files
- Merge pull request #3664 from edx/adam-inherit-max-attempts · ae542aee
```
add max_attempts to inheritance.py (LMS-2130)
```
  Adam committed May 12, 2014
  ae542aee Browse Files
- Merge pull request #1 from edx/ned/tweaks-for-pr-3464 · f247adc4
```
Simple fixes
```
  Carson Gee committed May 12, 2014
  f247adc4 Browse Files
- Fix #3347: "Run Code" reloads page in Matlab Problem · 8430be3d
```
Instead of refreshing only the necessary parts,
"Run Code" reloads the whole page.

This commit fixes this behaviour, by refreshing the
specific elements belonging to the Problem instead.

Also tidies up indentation.
```
  dragonfi committed May 12, 2014
  8430be3d Browse Files
- Add my name to the authors file · c07b3605
  dragonfi committed May 12, 2014
  
  c07b3605 Browse Files
- fix importing bug (STUD-1599) · a51a0c55
```
add target_location_namespace check
```
  Adam Palay committed May 12, 2014
  a51a0c55 Browse Files
- add max-attempts to inheritance.py (LMS-2130) · e5fa0c5d
  Adam Palay committed May 12, 2014
  
  e5fa0c5d Browse Files
- Simple fixes · 2f7adda0
```
- Ensure temp files are cleaned up.
- Refactor a function with three return statements.
```
  Ned Batchelder committed May 12, 2014
  2f7adda0 Browse Files