Commits · b80d1904add66c214515850a3923ef22756fc33f · edx / edx-platform · GitLab

17 May, 2012 15 commits
- Make scss urls relative to the directory that they are in · b80d1904
  Calen Pennington committed May 17, 2012
  
  b80d1904 Browse Files
- Merge branch 'master' into asset-pipeline · bc823d3b
```
Conflicts:
	djangoapps/multicourse/__init__.py
	requirements.txt
	sass/_info.scss
	sass/_textbook.scss
	sass/courseware/_sequence-nav.scss
	sass/courseware/_video.scss
	sass/index/_base.scss
	sass/index/_extends.scss
	sass/index/_footer.scss
	sass/index/_header.scss
	sass/index/_index.scss
	sass/index/_variables.scss
	sass/layout/_calculator.scss
	sass/print.scss
	static/css
	static/css/application.css
	static/css/marketing.css
	templates/main.html
	templates/marketing.html
	templates/sass/index/_base.scss
	templates/sass/index/_extends.scss
	templates/sass/index/_footer.scss
	templates/sass/index/_header.scss
	templates/sass/index/_index.scss
	templates/sass/index/_variables.scss
	templates/sass/marketing/_base.scss
	templates/sass/marketing/_extends.scss
	templates/sass/marketing/_footer.scss
	templates/sass/marketing/_header.scss
	templates/sass/marketing/_index.scss
	templates/sass/marketing/_variables.scss
```
  Calen Pennington committed May 17, 2012
  bc823d3b Browse Files
- Cleaning up the envs/* files so that they will work with gunicorn_django · cc6e0c55
  Calen Pennington committed May 17, 2012
  
  cc6e0c55 Browse Files
- Make tests work by default, without having to create any extra directories · a61cbab3
  Calen Pennington committed May 17, 2012
  
  a61cbab3 Browse Files
- Search the path for both django-admin.py and django-admin when running tests · 37abb7aa
  Calen Pennington committed May 17, 2012
  
  37abb7aa Browse Files
- Ignore long lines in pep8 · 2efc0133
  Calen Pennington committed May 17, 2012
  
  2efc0133 Browse Files
- Clean up indentation in ssl_auth · 4a9a28c7
  Calen Pennington committed May 17, 2012
  
  4a9a28c7 Browse Files
- Have git create a folder that's required for the tests · 56e8ecdf
  Calen Pennington committed May 17, 2012
  
  56e8ecdf Browse Files
- Fixing up check_course to pull in modules correctly · d387843c
  Calen Pennington committed May 17, 2012
  
  d387843c Browse Files
- changes text color of highlited section in courseware index from red to black · 1652ec38
  Galen Frechette committed May 17, 2012
  
  1652ec38 Browse Files
- improves communication of current selection in the courseware index sidebar · 2d7e36b4
  Galen Frechette committed May 17, 2012
  
  2d7e36b4 Browse Files
- handles the case of no title or sub title in the courseware index links · 2b4437c9
  Galen Frechette committed May 17, 2012
  
  2b4437c9 Browse Files
- wip more defined week headings · 12eb7cf6
  Galen Frechette committed May 17, 2012
  
  12eb7cf6 Browse Files
- wip better communication of current page in course ware · 825cf0e0
  Galen Frechette committed May 17, 2012
  
  825cf0e0 Browse Files
- Ike's changes to enable multicourse, new response types, etc. · ad448828
  Isaac Chuang committed May 16, 2012
  
  ad448828 Browse Files
16 May, 2012 6 commits
- minor fixes for IE bugs · e45eb9fb
  Kyle Fiedler committed May 16, 2012
  
  e45eb9fb Browse Files
- Merge pull request #50 from MITx/el-border-radius-course-content-fix · 5053ba4b
```
Fixes border radius overflow issue on course content wrapper
```
  kylefiedler committed May 16, 2012
  5053ba4b Browse Files
- Fixes border radius overflow issue on course content wrapper · 5148746d
  Edward Loveall committed May 16, 2012
  
  5148746d Browse Files
- Added msising marketing files · 1e8ab224
  Kyle Fiedler committed May 16, 2012
  
  1e8ab224 Browse Files
- Merge pull request #47 from MITx/kf-scss-cleanup · ea87d82c
```
Kf scss cleanup
```
  Galen Frechette committed May 16, 2012
  ea87d82c Browse Files
- Cleaned up unused functions now in bourbon and unused variables · b17d83a4
  Kyle Fiedler committed May 16, 2012
  
  b17d83a4 Browse Files
15 May, 2012 13 commits
- Removed print.scss, moved index to marketing, started to alphabatize · 60bd63a5
  Kyle Fiedler committed May 15, 2012
  
  60bd63a5 Browse Files
- Merge pull request #44 from MITx/gf-sequence-nav · ff366ad6
```
makes the sequence nav more semantic and replaces js hover with css
```
  kylefiedler committed May 15, 2012
  ff366ad6 Browse Files
- refactors some of the sequence nav styles · d0a73267
  Galen Frechette committed May 15, 2012
  
  d0a73267 Browse Files
- makes the sequence nav more semantic and replaces js hover with css · 709faa47
  Galen Frechette committed May 15, 2012
  
  709faa47 Browse Files
- Exclude reports from debian package · 1b8ea444
  Calen Pennington committed May 15, 2012
  
  1b8ea444 Browse Files
- Add pylint and pep8 to test deps · 3c9b2e3d
  Calen Pennington committed May 15, 2012
  
  3c9b2e3d Browse Files
- Move test reports into a separate directory · 4a3929a2
  Calen Pennington committed May 15, 2012
  
  4a3929a2 Browse Files
- Don't step on Ruby's built in VERSION constant · e3dc7d0a
  Calen Pennington committed May 15, 2012
  
  e3dc7d0a Browse Files
- Add pylint command · 337f1aff
  Calen Pennington committed May 15, 2012
  
  337f1aff Browse Files
- Fixing tests and removing unused/broken code · 08620eaf
  Calen Pennington committed May 15, 2012
  
  08620eaf Browse Files
- Don't try and install stuff from requirements.txt · a712fe02
  Calen Pennington committed May 15, 2012
  
  a712fe02 Browse Files
- Install all requirements before running tests · f7e947b5
  Calen Pennington committed May 15, 2012
  
  f7e947b5 Browse Files
- Minor formatting cleanup · 02bb23f4
  Calen Pennington committed May 15, 2012
  
  02bb23f4 Browse Files
14 May, 2012 6 commits
- Added nav for sidebar links · 2d751185
  Kyle Fiedler committed May 14, 2012
  
  2d751185 Browse Files
- Made links in sidebar all in p> · 89afc98f
  Kyle Fiedler committed May 14, 2012
  
  89afc98f Browse Files
- Make rake test install the test requirements · 8567fb16
  Calen Pennington committed May 14, 2012
  
  8567fb16 Browse Files
- Use the django-nose test runner, for the coverage features · a7995df6
  Calen Pennington committed May 14, 2012
  
  a7995df6 Browse Files
- Merge pull request #42 from MITx/ps-fix-global-context · f0c07b28
```
Fix missing `global_context` problem
```
  pmitros committed May 14, 2012
  f0c07b28 Browse Files
- Fix missing `global_context` problem · 28d12628
```
This problem was introduced in 232e758c
and caused the check answer button to not functioning.
```
  Prem Sichanugrist committed May 14, 2012
  28d12628 Browse Files