Commits · 30452d3202ec32c254ac8b88ef8ab233360b4b25 · edx / edx-platform · GitLab

23 Jul, 2012 25 commits
- Get pylint running on all modules again · 30452d32
  Calen Pennington committed Jul 23, 2012
  
  30452d32 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 #265 from MITx/mm-dek · b7a389df
```
Add dek to berkeley story.
```
  David Ormsbee committed Jul 23, 2012
  b7a389df Browse Files
- Add dek to berkeley story. · 343f5a53
  Matthew Mongeau committed Jul 23, 2012
  
  343f5a53 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
- 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 15 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
- Remove migration that conflicts with smooth_registration · 44f5891f
  David Ormsbee committed Jul 22, 2012
  
  44f5891f Browse Files
- Move migration for new reg fields so as not to conflict with smooth_registration · 7192c309
  David Ormsbee committed Jul 22, 2012
  
  7192c309 Browse Files
- Merge branch 'release/1.0' into dormsbee/change_reg_fields · 942183d7
  David Ormsbee committed Jul 22, 2012
  
  942183d7 Browse Files
- Accidentally disabled cache_if_anonymous earlier. Re-enabling. · 6caee537
  Bridger Maxwell committed Jul 22, 2012
  
  6caee537 Browse Files
- Tiny spacing issue with dashboard messages. · 0103c405
  David Ormsbee committed Jul 22, 2012
  
  0103c405 Browse Files
- Put course numbers, real start dates on Dashboard · 607e4859
  David Ormsbee committed Jul 22, 2012
  
  607e4859 Browse Files
- Merge pull request #253 from MITx/smooth_registration · fa510469
```
Smooth registration
```
  David Ormsbee committed Jul 22, 2012
  fa510469 Browse Files
- Disabled student migration 0011, which had not net effect and was causing InnoDB errors. · 9afb0f8b
  Bridger Maxwell committed Jul 22, 2012
  
  9afb0f8b Browse Files
- Changed log level to exception. · ef32adc1
  Bridger Maxwell committed Jul 22, 2012
  
  ef32adc1 Browse Files
- Change over to new reg fields (styling still broken) · 7f3a4434
  David Ormsbee committed Jul 22, 2012
  
  7f3a4434 Browse Files
- Ignoring ie.css · d798b4ac
  Bridger Maxwell committed Jul 22, 2012
  
  d798b4ac Browse Files