Commits · b2c605a18728387d7bb8365b000d9bef597cb20f · edx / edx-platform

06 Sep, 2013 7 commits
- Addressing comments by Jean Michel for PR 867. · b2c605a1
```
Forgot to include local variables in var statement.
```
  Valera Rozuvan committed Sep 06, 2013
  b2c605a1 Browse Files
- Fix for test. · 8ffd1636
```
Must clear the state youtubeXhr variable before counting number
of ajax calls.
```
  Valera Rozuvan committed Sep 06, 2013
  8ffd1636 Browse Files
- Jasmine test to verify that only one check for YT is made. · 545af7e8
```
We test for the number of ajax calls made when there are 3
videos on the page.
```
  Valera Rozuvan committed Sep 06, 2013
  545af7e8 Browse Files
- Merge pull request #854 from edx/jmclaus/bugfix_tabbing_video_speed_control · faf1f548
```
Speed button know behaves like the volume button when tabbing forward or...
```
  jmclaus committed Sep 06, 2013
  faf1f548 Browse Files
- Added test to verify that there is a certain order in the controls -- tabbing on… · e1f75666
```
Added test to verify that there is a certain order in the controls -- tabbing on the speed control will malfunction if it is not the case.
```
  jmclaus committed Sep 06, 2013
  e1f75666 Browse Files
- Added focus tracking to play/pause button. This fixes a bug where the tabbing,… · 8e2c5bca
```
Added focus tracking to play/pause button. This fixes a bug where the tabbing, in certain condition, would get stuck on speed button.
```
  jmclaus committed Sep 06, 2013
  8e2c5bca Browse Files
- Speed button know behaves like the volume button when tabbing forward or backward. · 578e02b5
  jmclaus committed Sep 06, 2013
  
  578e02b5 Browse Files
05 Sep, 2013 14 commits
- Merge pull request #845 from edx/bugfix/ichuang/fix-capa-optioninput-for-inline · 9aa024b5
```
Fix capa optioninput template to honor inline flag
```
  chrisndodge committed Sep 05, 2013
  9aa024b5 Browse Files
- Merge pull request #872 from edx/christina/about-page · a78c913d
```
Don't show course about page link when we have the marketing site.
```
  Christina Roberts committed Sep 05, 2013
  a78c913d Browse Files
- Merge branch 'release' · 25ce1fe7
  Adam Palay committed Sep 05, 2013
  
  25ce1fe7 Browse Files
- Merge pull request #634 from antoviaque/vagrant-provisioning-resume · d20359aa
```
vagrant: Add flag to ensure install is completed at least once
```
  David Baumgold committed Sep 05, 2013
  d20359aa Browse Files
- Don't show course about page link when we have the marketing site. · 4e677836
```
STUD-733
```
  cahrens committed Sep 05, 2013
  4e677836 Browse Files
- Merge pull request #871 from edx/fix/cdodge/re-enable-enrollment-start-stop · 545d5770
```
due to the MixedModuleStore pending release, we need to make enrollment ...
```
  chrisndodge committed Sep 05, 2013
  545d5770 Browse Files
- due to the MixedModuleStore pending release, we need to make enrollment… · 4a12cb60
```
due to the MixedModuleStore pending release, we need to make enrollment start/end dates editable in Studio
```
  Chris Dodge committed Sep 05, 2013
  4a12cb60 Browse Files
- vagrant: Add flag to ensure install is completed at least once · 0a5b6826
```
The provisioning script used to check for the existence of the
`/opt/edx/node_modules` folder to decide if the installation has already
been completed. However, since additional instructions were executed
by the installer afterwards, any installation error (eg. download
timeouts on low quality connections) happening between the creation of
that folder and the end of the installation wouldn't be recovered from
on the next vagrant instance boot.
```
  Xavier Antoviaque committed Sep 05, 2013
  0a5b6826 Browse Files
- Fix test. · 5d55714c
  Anton Stupak committed Sep 05, 2013
  
  5d55714c Browse Files
- Fix selector. · 961bd4c9
  Anton Stupak committed Sep 05, 2013
  
  961bd4c9 Browse Files
- Merge pull request #868 from edx/hotfix/lose_header_bug · 5658e6bc
```
Fix bug when editing video causes other components to lose their header
```
  polesye committed Sep 05, 2013
  5658e6bc Browse Files
- Fix test. · d93215c0
  Anton Stupak committed Sep 05, 2013
  
  d93215c0 Browse Files
- Fix selector. · af6d0eb1
  Anton Stupak committed Sep 05, 2013
  
  af6d0eb1 Browse Files
- consistently use inline=False as default in capa inputtypes · 69f72989
  ichuang committed Sep 04, 2013
  
  69f72989 Browse Files
04 Sep, 2013 11 commits
- Merge pull request #859 from edx/jbau/studio-link-in-instructor-panel · 08168ec6
```
Add link in lms legacy instructor dashboard to cms course_index
```
  Jason Bau committed Sep 04, 2013
  08168ec6 Browse Files
- Address review comments for lms_link_to_cms · ec989e49
```
* Uses override_settings to provide test variable
* Move location of cms link to upper right
* PEP8 / Pylink
```
  Jason Bau committed Sep 04, 2013
  ec989e49 Browse Files
- Merge pull request #863 from edx/ned/fix-simple-things-because,-damn · ac2b7a3a
```
fix simple things because, damn
```
  Ned Batchelder committed Sep 04, 2013
  ac2b7a3a Browse Files
- Don't fetch the editor for XML courses · 577aeed3
  Sarina Canelake committed Sep 04, 2013
  
  577aeed3 Browse Files
- fix simple things because, damn · 3a5f718a
  Ned Batchelder committed Sep 04, 2013
  
  3a5f718a Browse Files
- add nltk to sandbox reqs · fb84541b
  Adam Palay committed Sep 04, 2013
  
  fb84541b Browse Files
- Merge pull request #861 from edx/fix/adam/add-edge-reqs · 09169578
```
add requests and nltk to sandbox reqs
```
  Adam committed Sep 04, 2013
  09169578 Browse Files
- add nltk to sandbox reqs · 6078f4c6
  Adam Palay committed Sep 04, 2013
  
  6078f4c6 Browse Files
- Pass in harvest args to fasttest_acceptance, not the args array · b2b23fa9
  Will Daly committed Sep 04, 2013
  
  b2b23fa9 Browse Files
- Merge pull request #858 from edx/will/harvest-args-fix · 75b588e0
```
Pass in harvest args to fasttest_acceptance, not the args array
```
  Will Daly committed Sep 04, 2013
  75b588e0 Browse Files
- Pass in harvest args to fasttest_acceptance, not the args array · 9b1a5b49
  Will Daly committed Sep 03, 2013
  
  9b1a5b49 Browse Files
03 Sep, 2013 8 commits
- Merge pull request #855 from edx/sarina/bulkemail-violations · 51fcb524
```
Cleanup bulk email app
```
  Sarina Canelake committed Sep 03, 2013
  51fcb524 Browse Files
- Merge pull request #853 from edx/fix/adam/pylint-pep8 · ef042c39
```
fix pep8 and pylint errors
```
  Adam committed Sep 03, 2013
  ef042c39 Browse Files
- Merge pull request #856 from edx/adam/merge-conflicts · 3cc793b0
```
Adam/merge conflicts
```
  Adam committed Sep 03, 2013
  3cc793b0 Browse Files
- Cleanup bulk email app · bfebe684
  Sarina Canelake committed Sep 03, 2013
  
  bfebe684 Browse Files
- resolve merge conflict with hotfix branch · 67890b3c
  Adam Palay committed Sep 03, 2013
  
  67890b3c Browse Files
- Merge pull request #851 from edx/hotfix/release-multiple-video-bug · 6787fbbf
```
Hotfix/release multiple video bug
```
  Adam committed Sep 03, 2013
  6787fbbf Browse Files
- Merge pull request #837 from edx/will/faster-acceptance-test-startup · e284ac68
```
Skip migrations if running acceptance in fasttest mode
```
  Will Daly committed Sep 03, 2013
  e284ac68 Browse Files
- fix pep8 and pylint errors · 300f7f13
```
Conflicts:
	cms/djangoapps/contentstore/views/course.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	lms/envs/common.py
```
  Adam Palay committed Sep 03, 2013
  300f7f13 Browse Files