Commits · 5995a76254cdf266e7d3bc56a598a6c62a3a9c7c · edx / edx-platform · GitLab

18 Oct, 2013 40 commits
- sanity restored. · 5995a762
  e0d committed Oct 18, 2013
  
  5995a762 Browse Files
- path fix. · a008cc6b
  e0d committed Oct 18, 2013
  
  a008cc6b Browse Files
- Fixes for the AWS environment config. · 6700a3ec
  e0d committed Oct 18, 2013
  
  6700a3ec Browse Files
- Merge pull request #1411 from edx/will/disable-captions · e2d23fcc
```
Disable test seen to fail in master
```
  Will Daly committed Oct 18, 2013
  e2d23fcc Browse Files
- Disable test seen to fail in master · 2109fdb3
  Will Daly committed Oct 18, 2013
  
  2109fdb3 Browse Files
- Merge pull request #1408 from edx/will/fix-jscover-failures · ac891b38
```
Will/fix jscover failures
```
  Will Daly committed Oct 18, 2013
  ac891b38 Browse Files
- Merge pull request #1399 from edx/zoldak/fix-lms-navigation-tests · 159f020d
```
Change logic for section selection in navigation tests.
```
  Jay Zoldak committed Oct 18, 2013
  159f020d Browse Files
- Merge pull request #1339 from edx/anton/fix-video-js-unit-tests · 70e5e80e
```
Fix broken tests for video player
```
  polesye committed Oct 18, 2013
  70e5e80e Browse Files
- Merge pull request #1407 from edx/dhm/bug_config · d15bfb67
```
Add temporary args to swallow deprecated parms.
```
  Don Mitchell committed Oct 18, 2013
  d15bfb67 Browse Files
- Add temporary args to swallow deprecated parms. · f4cf3315
  Don Mitchell committed Oct 18, 2013
  
  f4cf3315 Browse Files
- Merge pull request #1406 from edx/post-release-2013-10-17-master · f831a0ad
```
Post release 2013 10 17 master
```
  brianhw committed Oct 18, 2013
  f831a0ad Browse Files
- Create reports/javascript so test:js doesn't fail the first time · 04cce630
  Will Daly committed Oct 18, 2013
  
  04cce630 Browse Files
- Use js-test-tool v0.1.4 · 7c15edf6
  Will Daly committed Oct 18, 2013
  
  7c15edf6 Browse Files
- Merge pull request #1403 from edx/ned/small-dictfielddata-cleanups · 009b3e9c
```
Simple cleanups of DictFieldData
```
  Ned Batchelder committed Oct 18, 2013
  009b3e9c Browse Files
- Merge pull request #1332 from edx/giulio/register-page · 19d3e31d
```
Change various text items to be more clear for users, as well as some grammar
```
  Giulio Gratta committed Oct 18, 2013
  19d3e31d Browse Files
- Merge pull request #1292 from edx/talbs/update-sass-bourbon-neat · 38153f95
```
Sass 3.2.12, Neat 1.4.0
```
  Brian Talbot committed Oct 18, 2013
  38153f95 Browse Files
- Enable acceptance test. · eaf5eb29
  polesye committed Oct 18, 2013
  
  eaf5eb29 Browse Files
- Merge pull request #1400 from edx/will/fix-grading-test · 9f1c5dd1
```
Added explicit wait to avoid reading default grading value
```
  Will Daly committed Oct 18, 2013
  9f1c5dd1 Browse Files
- Update master with hotfixes from release-2013-10-17. · aa172272
  Brian Wilson committed Oct 18, 2013
  
  aa172272 Browse Files
- Fix video voulme test. · 32ca9887
  polesye committed Oct 18, 2013
  
  32ca9887 Browse Files
- Uncomment acceptance tests. · 322b17ee
  polesye committed Oct 18, 2013
  
  322b17ee Browse Files
- Fix timeout. · c85bbabb
  polesye committed Oct 18, 2013
  
  c85bbabb Browse Files
- Add acceptance test instead of broken js unit test. · e95ee994
  polesye committed Oct 18, 2013
  
  e95ee994 Browse Files
- BLD-353: Fix js unit tests. · 7121db0a
  polesye committed Oct 18, 2013
  
  7121db0a Browse Files
- updating Neat generated utility files · 3a639ece
  Brian Talbot committed Oct 18, 2013
  
  3a639ece Browse Files
- updating to Sass 3.2.12 and Neat 1.4.0 · 5bbe330c
  Brian Talbot committed Oct 18, 2013
  
  5bbe330c Browse Files
- Merge pull request #1342 from edx/anton/fix-video-multi-speed-bug · 79f11de6
```
Video player: Fix multi speed bug
```
  polesye committed Oct 18, 2013
  79f11de6 Browse Files
- Added explicit wait to avoid reading default grading value · 14b5f42c
  Will Daly committed Oct 18, 2013
  
  14b5f42c Browse Files
- Change logic for section selection in navigation tests. · 494a618c
  Jay Zoldak committed Oct 18, 2013
  
  494a618c Browse Files
- Merge pull request #1307 from edx/dhm/datastore_config · 9df72360
```
Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation"...
```
  Don Mitchell committed Oct 18, 2013
  9df72360 Browse Files
- Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation"" · 8fe99a6b
```
This reverts commit a517dc20.
```
  Don Mitchell committed Oct 18, 2013
  8fe99a6b Browse Files
- Merge pull request #1394 from edx/zoldak/fix-cms-problem-acceptance · 70cea998
```
Add synchronization logic for waiting after adding components 
```
  Jay Zoldak committed Oct 18, 2013
  70cea998 Browse Files
- Merge pull request #1362 from edx/will/acceptance-test-logs · 7aff8a77
```
Write Django logs to file during acceptance tests
```
  Will Daly committed Oct 18, 2013
  7aff8a77 Browse Files
- Simple cleanups of DictFieldData · d3c7c083
```
I tried to make DictFieldData strict about only being used with one
block.  That effort failed ultimately, but these are reasonable changes
I made along the way.
```
  Ned Batchelder committed Oct 18, 2013
  d3c7c083 Browse Files
- Merge pull request #1336 from edx/anton/fix-video-display-issue · 613e7f57
```
Fix Video player display issue
```
  polesye committed Oct 18, 2013
  613e7f57 Browse Files
- Remove $.cookie. · df091e50
  polesye committed Oct 18, 2013
  
  df091e50 Browse Files
- Fix typo. · dda6fbd4
  polesye committed Oct 18, 2013
  
  dda6fbd4 Browse Files
- Add js unit tests. · 73011383
  polesye committed Oct 18, 2013
  
  73011383 Browse Files
- Add resizing. · eeab7847
  polesye committed Oct 18, 2013
  
  eeab7847 Browse Files
- Merge pull request #1395 from edx/giulio/ICE-confirm-reset · cca057df
```
Add confirm dialog to ICE reset changes
```
  Giulio Gratta committed Oct 17, 2013
  cca057df Browse Files