Commits · 2524e6313a9cd174ebd8db5c32be9f41eb7116d2 · edx / edx-platform · GitLab

23 Jul, 2012 36 commits
- Update index video. · 2524e631
  Matthew Mongeau committed Jul 23, 2012
  
  2524e631 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 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 #257 from MITx/bridger/js_slim · 67a18ec5
```
Javascript slim
```
  Calen Pennington committed Jul 23, 2012
  67a18ec5 Browse Files
- Removed a bunch of non-necessary javascript from homepage. Most of it was put… · 9ebac1bd
```
Removed a bunch of non-necessary javascript from homepage. Most of it was put back in courseware. A new PIPELINE_JS group 'courseware' was created, for pipeline javascript files that should only be in the courseware.
```
  Bridger Maxwell committed Jul 23, 2012
  9ebac1bd Browse Files
22 Jul, 2012 4 commits
- Merge pull request #256 from MITx/dormsbee/change_reg_fields · 9d81a8be
```
Dormsbee/change reg fields
```
  David Ormsbee committed Jul 22, 2012
  9d81a8be Browse Files
- Merge pull request #255 from MITx/release_fixes · 06c2d1f1
```
Added a favicon.
```
  David Ormsbee committed Jul 22, 2012
  06c2d1f1 Browse Files
- Fix up the signup modal for registration for the new fields. · 074fc243
  David Ormsbee committed Jul 22, 2012
  
  074fc243 Browse Files
- Added a favicon. · 0cac3602
  Bridger Maxwell committed Jul 22, 2012
  
  0cac3602 Browse Files