Commits · 3c0df16b0ca168eb384625a31d27dd8ede05098e · edx / edx-platform

20 Dec, 2013 24 commits
- Merge pull request #2004 from edx/christina/fix-thumbnail-warning · 3c0df16b
```
Properly format errors/warnings.
```
  Christina Roberts committed Dec 20, 2013
  3c0df16b Browse Files
- Merge pull request #2017 from edx/ned/i18n-minor-improvements · dfb04bc4
```
Minor i18n improvements
```
  Ned Batchelder committed Dec 20, 2013
  dfb04bc4 Browse Files
- Merge pull request #1980 from edx/dhm/locator_block_id · 6c4aae73
```
Rename BlockUsageLocator's block_id field from usage_id
```
  Don Mitchell committed Dec 20, 2013
  6c4aae73 Browse Files
- Merge pull request #2013 from edx/sarina/update-contributing · 1295e763
```
Set review timeframe more appropriately in contributing docs
```
  Sarina Canelake committed Dec 20, 2013
  1295e763 Browse Files
- Merge pull request #1796 from edx/jmclaus/feature_jsinput_template · 9de690af
```
Added JSInput template in Studio.
```
  jmclaus committed Dec 20, 2013
  9de690af Browse Files
- Added JSInput template to Studio and a sop attribute to JSInput. Only if it's… · 5478525a
```
Added JSInput template to Studio and a sop attribute to JSInput. Only if it's set to false, as in JSInput's template, will JSChannel be used to bypass it. In all other cases (attribute not present or set to something else), SOP is enforced. Compatibility with jsVGL is therefore maintained. Multiple JSInput are supported in a vertical. Also, save button now functions. [BLD-523, BLD-556, BLD-568]
```
  jmclaus committed Dec 20, 2013
  5478525a Browse Files
- Merge pull request #2016 from edx/markhoeber/documentation/stud-1033 · ce18bcec
```
added detail about tolerance for numerical problems
```
  srpearce committed Dec 20, 2013
  ce18bcec Browse Files
- Improve test coverage · a46e112a
```
and fix found errors.
```
  Don Mitchell committed Dec 20, 2013
  a46e112a Browse Files
- Remove needless non-package non-specs from urls.py · c37ab385
  Ned Batchelder committed Dec 20, 2013
  
  c37ab385 Browse Files
- i18n tests run better: no subprocess output, and no duplication of tests. · 550f15ca
  Ned Batchelder committed Dec 20, 2013
  
  550f15ca Browse Files
- Dummy text has more accents, and properly ignored more non-text things. · f1f76a9a
  Ned Batchelder committed Dec 20, 2013
  
  f1f76a9a Browse Files
- Minor style changes to the i18n directory. · 5e244b1c
  Ned Batchelder committed Dec 20, 2013
  
  5e244b1c Browse Files
- Merge pull request #1886 from edx/ned/add-tests-for-file-uploads · c0c895cb
```
Add a test for Django-based file uploads to problems.
```
  Ned Batchelder committed Dec 20, 2013
  c0c895cb Browse Files
- Merge pull request #1986 from edx/valera/move_logme_module_separate_file · 9f1bdc53
```
Moving logme Require JS module out of individual XModules/Capa problems.
```
  Valera Rozuvan committed Dec 20, 2013
  9f1bdc53 Browse Files
- Merge pull request #1749 from zubair-arbi/zub/bugfix/std823-addbaseview · ef51f74a
```
Added baseview(extended from backbone view), which can further extended ...
```
  zubair-arbi committed Dec 20, 2013
  ef51f74a Browse Files
- added detail about tolerance for numerical problems · 4f0b800d
```
Add minor detail based on feedbback in training class -- use word
tolerance for margin of error, as that's what people searched on.  add
example for both percentage and numerical tolerance
```
  Mark Hoeber committed Dec 20, 2013
  4f0b800d Browse Files
- Removed logme module. Using console.log() instead. · 1542a74d
```
Removing "logme" from comments.

BLD-608
```
  Valera Rozuvan committed Dec 20, 2013
  1542a74d Browse Files
- Merge pull request #1971 from edx/will/selenium-pages · f58e788b
```
Added Selenium page objects for LMS and studio
```
  Will Daly committed Dec 20, 2013
  f58e788b Browse Files
- Merge pull request #2002 from edx/will/rebalance-shards · d23f48f5
```
Rebalance acceptance test shards
```
  Will Daly committed Dec 20, 2013
  d23f48f5 Browse Files
- Add baseview(extended from backbone view), which can further extended by other… · a6fbcbd7
```
Add baseview(extended from backbone view), which can further extended by other views + Add fucntion to modify iframe and embed tags + add related tests
STUD-823
```
  Zubair Afzal committed Dec 20, 2013
  a6fbcbd7 Browse Files
- Merge pull request #2012 from edx/sarina/grade-download-wording · 608aaf31
```
Tweak language surrounding grade download button
```
  Sarina Canelake committed Dec 19, 2013
  608aaf31 Browse Files
- Tweak language surrounding grade download button · f330b1e6
  Sarina Canelake committed Dec 19, 2013
  
  f330b1e6 Browse Files
- Set review timeframe more appropriately in contributing docs · 93b6ca11
  Sarina Canelake committed Dec 19, 2013
  
  93b6ca11 Browse Files
- Merge pull request #2009 from edx/markhoeber/documentation/release-notes-12-17-13 · e1451ab1
```
Markhoeber/documentation/release notes 12 17 13
```
  Mark Hoeber committed Dec 19, 2013
  e1451ab1 Browse Files
19 Dec, 2013 16 commits
- Properly format errors/warnings. · 65756bbf
```
STUD-1063
```
  cahrens committed Dec 19, 2013
  65756bbf Browse Files
- Merge pull request #2006 from edx/zoldak/update-testing-doc · 8b929511
```
Update testing doc
```
  Jay Zoldak committed Dec 19, 2013
  8b929511 Browse Files
- Update testing doc · b4b611b9
  Jay Zoldak committed Dec 19, 2013
  
  b4b611b9 Browse Files
- fixing merge conflict from release · 86e3391b
  e0d committed Dec 19, 2013
  
  86e3391b Browse Files
- Added Selenium page objects for LMS and studio · 04e66be7
  Will Daly committed Dec 19, 2013
  
  04e66be7 Browse Files
- Merge pull request #2005 from edx/sylvia/documentation/add_image · f1b140ff
```
Add missing image file, correct typos
```
  Mark Hoeber committed Dec 19, 2013
  f1b140ff Browse Files
- Merge pull request #1806 from edx/anton/add-zooming-image-template · af4e3355
```
Add template for the zooming image in Studio.
```
  Anton Stupak committed Dec 19, 2013
  af4e3355 Browse Files
- BLD-206: Add template for the zooming image in Studio. · 042cb5c6
  polesye committed Dec 19, 2013
  
  042cb5c6 Browse Files
- Add missing image file, correct typos · 35e30f8c
```
Add the missing TextInput_MultipleAnswer.gif file. Correct
capitalization of another image file name so it'll appear in the docs.
```
  spearce committed Dec 19, 2013
  35e30f8c Browse Files
- Merge pull request #2003 from edx/sylvia/documentation/bld-474-v2 · 332477b6
```
Fix formatting problem in Working with Video Components
```
  Mark Hoeber committed Dec 19, 2013
  332477b6 Browse Files
- Fix formatting problem in Working with Video Components · 16adf364
  spearce committed Dec 19, 2013
  
  16adf364 Browse Files
- Update Text Input problem type · 94a792c9
```
Update Text Input problem type: Multiple correct responses are now
possible
```
  spearce committed Dec 19, 2013
  94a792c9 Browse Files
- Rebalance acceptance test shards · 28e25b75
  Will Daly committed Dec 19, 2013
  
  28e25b75 Browse Files
- Merge pull request #1976 from edx/will/jenkins-script-update · 75d44039
```
Updated Jenkins scripts
```
  Will Daly committed Dec 19, 2013
  75d44039 Browse Files
- Merge pull request #1965 from edx/will/fake-server-refactor · 1081786c
```
Stub Server Port Conflicts and Refactor
```
  Will Daly committed Dec 19, 2013
  1081786c Browse Files
- Moved stub servers to terrain · 0fd03cfb
```
Refactored stub services for style and DRY

Added unit tests for stub implementations

Updated acceptance tests that depend on stubs.

Updated Studio acceptance tests to use YouTube stub server; fixed failing tests in devstack.
```
  Will Daly committed Dec 19, 2013
  0fd03cfb Browse Files