Commits · 944d2d61f124e002e63819967a48e5cfb8227465 · edx / edx-platform · GitLab

16 May, 2013 5 commits
- Make sure to get the correct modulestore on delete (static tabs do not exist in draft modulestore). · 944d2d61
```
#324
```
  cahrens committed May 16, 2013
  944d2d61 Browse Files
- Merge pull request #2023 from edx/feature/will/ci-lettuce-tests · fca63f06
```
Feature/will/ci lettuce tests
```
  Will Daly committed May 16, 2013
  fca63f06 Browse Files
- Updated Jenkins script to reflect new requirements installation process · d1fee427
  Will Daly committed May 16, 2013
  
  d1fee427 Browse Files
- Pep8 fixes · 1e1e6450
  Will Daly committed May 16, 2013
  
  1e1e6450 Browse Files
- Merge branch 'master' into feature/will/ci-lettuce-tests · 342b3bb0
```
Resolved conflict with changes to Rakefile in master

Conflicts:
	rakefile
```
  Will Daly committed May 16, 2013
  342b3bb0 Browse Files
15 May, 2013 35 commits
- Merge branch 'feature/will/ci-lettuce-tests' of… · e78436db
```
Merge branch 'feature/will/ci-lettuce-tests' of https://github.com/edx/edx-platform into feature/will/ci-lettuce-tests
```
  Will Daly committed May 15, 2013
  e78436db Browse Files
- Removed COURSES_ROOT and DATA_DIR from cms/envs/acceptance.py · 3a981cfa
  Will Daly committed May 15, 2013
  
  3a981cfa Browse Files
- Merge pull request #2048 from edx/fix/cale/prereqs-before-django · 281662a4
```
Install python prereqs before trying to run django or install requiremen...
```
  Calen Pennington committed May 15, 2013
  281662a4 Browse Files
- Merge pull request #2047 from edx/fix/btalbot/studio-typographyvariables · 6dcf7be0
```
Studio - Resolving incorrect Sans Serif Sass Variable Definition
```
  Brian Talbot committed May 15, 2013
  6dcf7be0 Browse Files
- Merge branch 'master' into fix/btalbot/studio-typographyvariables · 6a618cbe
  Brian Talbot committed May 15, 2013
  
  6a618cbe Browse Files
- Install python prereqs before trying to run django or install requirements/local.txt · 0df9f714
  Calen Pennington committed May 15, 2013
  
  0df9f714 Browse Files
- Updated docs to add a note about Chrome / ChromeDriver revisions. · 4e118a08
  Will Daly committed May 15, 2013
  
  4e118a08 Browse Files
- Added comments for skipped tests · 59f68c21
  Will Daly committed May 15, 2013
  
  59f68c21 Browse Files
- studio - fixes Sass variable defintion to ensure the older -serif references the… · d1c62988
```
studio - fixes Sass variable defintion to ensure the older -serif references the proper new -sans-serif variable
```
  Brian Talbot committed May 15, 2013
  d1c62988 Browse Files
- Merge pull request #1961 from edx/feature/cale/maintain-dev-environment · ec7c4782
```
Feature/cale/maintain dev environment
```
  Calen Pennington committed May 15, 2013
  ec7c4782 Browse Files
- Fix up documentation · 9c2756b7
  Calen Pennington committed May 15, 2013
  
  9c2756b7 Browse Files
- Make the externally facing asset watch commands wait for user intervention, and… · b5c134e2
```
Make the externally facing asset watch commands wait for user intervention, and add internal tasks that only run as long as the rake process
```
  Calen Pennington committed May 15, 2013
  b5c134e2 Browse Files
- Be more graceful when terminating background processes · 91dce34f
  Calen Pennington committed May 15, 2013
  
  91dce34f Browse Files
- Use install_prereqs in tests · 352a4da5
  Calen Pennington committed May 15, 2013
  
  352a4da5 Browse Files
- Use local node_modules as system_node_path if none is set · 0701e1a7
  Calen Pennington committed May 15, 2013
  
  0701e1a7 Browse Files
- Use coffee installed in local node_modules for tests · 52d209d0
  Calen Pennington committed May 15, 2013
  
  52d209d0 Browse Files
- Install prereqs before running pep8 or pylint · 089ac002
  Calen Pennington committed May 15, 2013
  
  089ac002 Browse Files
- Add mechanism for running migrations of developer workspaces · ed9b91e9
  Calen Pennington committed May 15, 2013
  
  ed9b91e9 Browse Files
- Split rake file into smaller, more manageable pieces · 9d42bce5
  Calen Pennington committed May 15, 2013
  
  9d42bce5 Browse Files
- Allow disabling of prereq installation · 437158a4
  Calen Pennington committed May 15, 2013
  
  437158a4 Browse Files
- Clean up how asset prereq tasks are wired up · afdf10a4
  Calen Pennington committed May 15, 2013
  
  afdf10a4 Browse Files
- Allow overriding of prereqs cache dir · 6485b85a
  Calen Pennington committed May 15, 2013
  
  6485b85a Browse Files
- Install prereqs before starting cms/lms or running tests · a22287f1
  Calen Pennington committed May 15, 2013
  
  a22287f1 Browse Files
- Add a jasmine test runner for capa · 964c21ff
  Calen Pennington committed May 15, 2013
  
  964c21ff Browse Files
- Move Mysql and scipi to requirements/post.txt, because they require the contents… · 1c28f5a0
```
Move Mysql and scipi to requirements/post.txt, because they require the contents of requirements.txt to be completely installed
```
  Calen Pennington committed May 15, 2013
  1c28f5a0 Browse Files
- Make capa specify distribute 0.6.28 like the rest of the project · ef17e936
  Calen Pennington committed May 15, 2013
  
  ef17e936 Browse Files
- Pip installs paths relative to the current directory, not the directory the requirements file is in · 05d76c77
  Calen Pennington committed May 15, 2013
  
  05d76c77 Browse Files
- Use launchy for opening browsers · 9743e84d
  Calen Pennington committed May 15, 2013
  
  9743e84d Browse Files
- Clean out cruft from rake file · 8e54991b
  Calen Pennington committed May 15, 2013
  
  8e54991b Browse Files
- Remove unused fixtures · 4a835433
  Carlos Andrés Rocha committed May 15, 2013
  
  4a835433 Browse Files
- Clean root project directory · 79a029ce
  Carlos Andrés Rocha committed May 15, 2013
  
  79a029ce Browse Files
- Merge pull request #2019 from edx/fix/cale/xmodule-template-docs · 14bf7195
```
Add documentation of xmodule template files
```
  Calen Pennington committed May 15, 2013
  14bf7195 Browse Files
- Merge pull request #2027 from edx/fix/cale/allow-liveserver-port-ranges · 1746c600
```
Allow django liveserver to use larger port range
```
  Calen Pennington committed May 15, 2013
  1746c600 Browse Files
- Merge pull request #2028 from edx/feature/cale/flexible-repo-jenkins · f499dec1
```
Make gcli commands flexible around org and repo name
```
  Calen Pennington committed May 15, 2013
  f499dec1 Browse Files
- Merge pull request #1964 from edx/feature/cale/parallel-build-venvs · 96894452
```
Use one virtualenv for each parallel build process
```
  Calen Pennington committed May 15, 2013
  96894452 Browse Files