Commits · a2e1409dbb8f69c8f6412efef40dc6f7be111e0f · edx / edx-platform · GitLab

01 Aug, 2012 5 commits
- Merge pull request #328 from MITx/jarv/dev-script-updates · a2e1409d
```
Jarv/dev script updates
```
  jarv committed Aug 01, 2012
  a2e1409d Browse Files
- trailing whitespace · 94c19059
  John Jarvis committed Aug 01, 2012
  
  94c19059 Browse Files
- removing matplotlib from requirements.txt · 71898e48
  John Jarvis committed Aug 01, 2012
  
  71898e48 Browse Files
- sanity checking /usr/local, updating coffee script install location, old location no longer works · 8c1bb0ca
  John Jarvis committed Aug 01, 2012
  
  8c1bb0ca Browse Files
- Merge pull request #323 from MITx/kimth/lms-coderesponse · b9773b5d
```
Kimth/lms coderesponse
```
  ichuang committed Jul 31, 2012
  b9773b5d Browse Files
31 Jul, 2012 35 commits
- Merge pull request #324 from MITx/jarv/dev-script-updates · f0999281
```
Jarv/dev script updates
```
  jarv committed Jul 31, 2012
  f0999281 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates · b08ea47b
  John Jarvis committed Jul 31, 2012
  
  b08ea47b Browse Files
- submodules are not on a branch, no need to pull · 0642af01
  John Jarvis committed Jul 31, 2012
  
  0642af01 Browse Files
- removing unnecessary chdir · ecab194e
  John Jarvis committed Jul 31, 2012
  
  ecab194e Browse Files
- betting rvmrc handling · 5c73a6f2
  John Jarvis committed Jul 31, 2012
  
  5c73a6f2 Browse Files
- Merge pull request #325 from MITx/feature/kfiedler/courseware-style · 61fa1184
```
Navigation style and make askbot have style
```
  David Ormsbee committed Jul 31, 2012
  61fa1184 Browse Files
- removing virtualenv install lines that arent needed · 9c31715d
  John Jarvis committed Jul 31, 2012
  
  9c31715d Browse Files
- Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates · 4d1bf530
  John Jarvis committed Jul 31, 2012
  
  4d1bf530 Browse Files
- do not install virtualenv unless it needs to be upgraded (<1.7) · 37ba0395
  John Jarvis committed Jul 31, 2012
  
  37ba0395 Browse Files
- Tweaks to CodeMirror: fix indentation, textarea is vertically resizable · 11495563
  kimth committed Jul 31, 2012
  
  11495563 Browse Files
- Sorta fix askbot · b5b0d086
  Kyle Fiedler committed Jul 31, 2012
  
  b5b0d086 Browse Files
- Added some styles for the top navigation and for the sidebar navigation · 9d14033f
  Kyle Fiedler committed Jul 31, 2012
  
  9d14033f Browse Files
- Change absolute paths to relative in scss · f3567ddd
```
* makes collectstatic happy
```
  Victor Shnayder committed Jul 31, 2012
  f3567ddd Browse Files
- Remove obsolete js references · 71b9dbbb
  Victor Shnayder committed Jul 31, 2012
  
  71b9dbbb Browse Files
- always pip install virtualenv · e08cb506
  John Jarvis committed Jul 31, 2012
  
  e08cb506 Browse Files
- adding option back for --system-site-packages, will ensure virtualenv > 1.7 · 09199631
  John Jarvis committed Jul 31, 2012
  
  09199631 Browse Files
- adding askbot as a submodule of mitx · 50dc4e80
  John Jarvis committed Jul 31, 2012
  
  50dc4e80 Browse Files
- removing askbot-devel · 5e8d132a
  John Jarvis committed Jul 31, 2012
  
  5e8d132a Browse Files
- version is required http://gembundler.com/man/gemfile.5.html, this was causing… · aaeb0446
```
version is required http://gembundler.com/man/gemfile.5.html, this was causing rvm to return non-zero and thus causing the create-dev-env.sh script to fail
```
  John Jarvis committed Jul 31, 2012
  aaeb0446 Browse Files
- by default now stdout and stdin will appear on console, both are logged · 1279c860
  John Jarvis committed Jul 31, 2012
  
  1279c860 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates · 202b18a3
  John Jarvis committed Jul 31, 2012
  
  202b18a3 Browse Files
- Merge pull request #322 from MITx/feature/kfiedler/courseware-style · fafa86b4
```
Added fix for videos start to zero out colors and mit styles
```
  David Ormsbee committed Jul 31, 2012
  fafa86b4 Browse Files
- Added fix for videos start to zero out colors and mit styles · d30ae538
  Kyle Fiedler committed Jul 31, 2012
  
  d30ae538 Browse Files
- Remove hardcoding of LMS callback URL and default queuename · 2e3c5de1
  kimth committed Jul 31, 2012
  
  2e3c5de1 Browse Files
- Use build_absolute_uri rather than hardcoded sandbox URL · 0879f3e0
  kimth committed Jul 31, 2012
  
  0879f3e0 Browse Files
- Merge branch 'master' into kimth/lms-coderesponse · a773df58
  kimth committed Jul 31, 2012
  
  a773df58 Browse Files
- Extra empty line · 27e142dd
  kimth committed Jul 31, 2012
  
  27e142dd Browse Files
- Add askbot to lms staticfiles_dirs in test · b659846e
  Calen Pennington committed Jul 31, 2012
  
  b659846e Browse Files
- Merge pull request #321 from MITx/feature/kfiedler/courseware-style · 7bfd2173
```
Fixed jquery ui image problem and added a base style sheet for lms to ov...
```
  David Ormsbee committed Jul 31, 2012
  7bfd2173 Browse Files
- Fixed jquery ui image problem and added a base style sheet for lms to override fonts · 2bbb1979
  Kyle Fiedler committed Jul 31, 2012
  
  2bbb1979 Browse Files
- Simplify dict load in xqueue_callback · 3968e117
  kimth committed Jul 31, 2012
  
  3968e117 Browse Files
- Hardcoded URL moved to LMS for now · 22af531b
  kimth committed Jul 31, 2012
  
  22af531b Browse Files
- Re-add __init__.py for contentstore that was accidentally deleted in… · 2f95a8e1
```
Re-add __init__.py for contentstore that was accidentally deleted in 05add581
```
  Calen Pennington committed Jul 31, 2012
  2f95a8e1 Browse Files
- LMS provides fully qualified callback URL · e2f4995b
  kimth committed Jul 31, 2012
  
  e2f4995b Browse Files
- Merge pull request #319 from MITx/kimth/lms-coderesponse · 94e73936
```
Kimth/lms coderesponse
```
  ichuang committed Jul 30, 2012
  94e73936 Browse Files