Commits · 1d1a9173a412a51ab78cee8d3feffb4344561e5d · edx / edx-platform · GitLab

23 Jul, 2012 40 commits
- Cleaning up pep8 violations · 1d1a9173
  Calen Pennington committed Jul 23, 2012
  
  1d1a9173 Browse Files
- Merge remote-tracking branch 'origin/release/1.0' · 7ef8b6ac
  Calen Pennington committed Jul 23, 2012
  
  7ef8b6ac Browse Files
- Get pylint running on all modules again · 30452d32
  Calen Pennington committed Jul 23, 2012
  
  30452d32 Browse Files
- Merge pull request #270 from MITx/dormsbee/course_img_jpg · 0b3da68f
```
Use JPGs instead of PNG for course images
```
  bridger committed Jul 23, 2012
  0b3da68f Browse Files
- Use JPGs instead of PNG for course images · 80c04e14
  David Ormsbee committed Jul 23, 2012
  
  80c04e14 Browse Files
- Merge pull request #268 from MITx/kf-multicourse-design · 8be3f4f9
```
Make things more fluid
```
  David Ormsbee committed Jul 23, 2012
  8be3f4f9 Browse Files
- Merge pull request #267 from MITx/dormsbee/copy_edits_5 · ae879e86
```
Dormsbee/copy edits 5
```
  David Ormsbee committed Jul 23, 2012
  ae879e86 Browse Files
- Fix grid and make sure that everything is fluid · 54516a95
  Kyle Fiedler committed Jul 23, 2012
  
  54516a95 Browse Files
- Added min width for container · 6da83900
  Kyle Fiedler committed Jul 23, 2012
  
  6da83900 Browse Files
- Added som fixed for fluid design · b557363a
  Kyle Fiedler committed Jul 23, 2012
  
  b557363a Browse Files
- Merge remote-tracking branch 'origin/release/1.0' · ebe67d2d
```
Conflicts:
	common/djangoapps/student/views.py
```
  Calen Pennington committed Jul 23, 2012
  ebe67d2d Browse Files
- Merge pull request #266 from MITx/cpennington/fix_tests · b9c6e366
```
Cpennington/fix tests
```
  David Ormsbee committed Jul 23, 2012
  b9c6e366 Browse Files
- Add new, officially sanctioned final edX honor code. · 07f246f3
  David Ormsbee committed Jul 23, 2012
  
  07f246f3 Browse Files
- Fix failing tests · 7a34a8c3
  Calen Pennington committed Jul 23, 2012
  
  7a34a8c3 Browse Files
- Added a filestore pointing at the directory of the file being run for xmodule tests · 11eaab27
  Arjun Singh committed Jul 23, 2012
  
  11eaab27 Browse Files
- Add official edX privacy policy. · cff42ead
  David Ormsbee committed Jul 23, 2012
  
  cff42ead Browse Files
- Merge pull request #265 from MITx/mm-dek · b7a389df
```
Add dek to berkeley story.
```
  David Ormsbee committed Jul 23, 2012
  b7a389df Browse Files
- edX Terms of Service added · 81fdc2d9
  David Ormsbee committed Jul 23, 2012
  
  81fdc2d9 Browse Files
- Add dek to berkeley story. · 343f5a53
  Matthew Mongeau committed Jul 23, 2012
  
  343f5a53 Browse Files
- Final, blessed FAQ · f921726b
  David Ormsbee committed Jul 23, 2012
  
  f921726b Browse Files
- Merge pull request #260 from MITx/split-sass · 652aa520
```
Split sass
```
  Calen Pennington committed Jul 23, 2012
  652aa520 Browse Files
- Added changes to the way that css is linked · 9286d9f1
  Kyle Fiedler committed Jul 23, 2012
  
  9286d9f1 Browse Files
- Added course stylesheet to courseware template · b49a6586
  Kyle Fiedler committed Jul 23, 2012
  
  b49a6586 Browse Files
- Changed around the css · e6465e42
  Kyle Fiedler committed Jul 23, 2012
  
  e6465e42 Browse Files
- Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0 · edc02f7c
  Piotr Mitros committed Jul 23, 2012
  
  edc02f7c Browse Files
- Missing space before DFAQ · 5db41d0d
  Piotr Mitros committed Jul 23, 2012
  
  5db41d0d Browse Files
- Merge pull request #264 from MITx/mm-video-fixes-for-index · c5849805
```
Add rel=0 to all lightbox videos.
```
  David Ormsbee committed Jul 23, 2012
  c5849805 Browse Files
- Merge pull request #261 from MITx/kf-multicourse-design · 50e8b0a8
```
Added some design changes to the homepage header
```
  Calen Pennington committed Jul 23, 2012
  50e8b0a8 Browse Files
- Add rel=0 to all lightbox videos. · 315063ff
  Matthew Mongeau committed Jul 23, 2012
  
  315063ff Browse Files
- Added some design changes to the homepage header · 8eeeac71
  Kyle Fiedler committed Jul 23, 2012
  
  8eeeac71 Browse Files
- Merge pull request #259 from MITx/feature/cpennington/minimize_js_requests · 3087ec6c
```
Consolidate javascript at the bottom of the page and in a minimal number of django-pipeline groups
```
  David Ormsbee committed Jul 23, 2012
  3087ec6c Browse Files
- Merge pull request #258 from MITx/mm-sort-courses-by-course-number · e68aa55b
```
Sort by course number. Simplify university grouping.
```
  David Ormsbee committed Jul 23, 2012
  e68aa55b Browse Files
- Sort by course number. Simplify university grouping. · ee72a725
  Matthew Mongeau committed Jul 23, 2012
  
  ee72a725 Browse Files
- Merge remaining js files into django-pipeline groups · d19e50ae
  Calen Pennington committed Jul 23, 2012
  
  d19e50ae Browse Files
- Move most javascript loading to below the body, rather than head · d2d29b2c
  Calen Pennington committed Jul 23, 2012
  
  d2d29b2c Browse Files
- Consolidate code used for disabling USE_DJANGO_PIPELINE feature · 5915532a
  Calen Pennington committed Jul 23, 2012
  
  5915532a Browse Files
- Move vendor js into a single file · 5dd4e19c
  Calen Pennington committed Jul 23, 2012
  
  5dd4e19c Browse Files
- Merge pull request #249 from MITx/arjun/tests_filestore · 40dc770a
```
Added a filestore pointing at the directory of the file being run for xmodule tests
```
  Calen Pennington committed Jul 23, 2012
  40dc770a Browse Files
- Merge pull request #257 from MITx/bridger/js_slim · 67a18ec5
```
Javascript slim
```
  Calen Pennington committed Jul 23, 2012
  67a18ec5 Browse Files
- Merge pull request #246 from MITx/jarv/create-dev-script-updates · 098808c9
```
error in script for site package handling
```
  Calen Pennington committed Jul 23, 2012
  098808c9 Browse Files