Commits · d8d3eb144ca3f3f4bcf7340fefb911913a335249 · edx / edx-platform · GitLab

10 Jul, 2012 40 commits
- type tweeks in modals · d8d3eb14
  Galen Frechette committed Jul 10, 2012
  
  d8d3eb14 Browse Files
- makes some tweeks to global nav style, home page header and font styles · 8faa539a
  Galen Frechette committed Jul 10, 2012
  
  8faa539a Browse Files
- adds banner images to and refines header on find courses pages, various visual… · f7a1873a
```
adds banner images to and refines header on find courses pages, various visual tweeks and imporvements
```
  Galen Frechette committed Jul 10, 2012
  f7a1873a Browse Files
- adds links to university profile page · 5484cfd0
  Galen Frechette committed Jul 10, 2012
  
  5484cfd0 Browse Files
- fixes university attributes in course.html · 6afb8f7d
  Galen Frechette committed Jul 10, 2012
  
  6afb8f7d Browse Files
- wip header, wip header refactoring, improves course object visual design, improves footer · 1be9196d
  Galen Frechette committed Jul 10, 2012
  
  1be9196d Browse Files
- remove out of repo symlinks from static · 897a89c5
  David Ormsbee committed Jul 10, 2012
  
  897a89c5 Browse Files
- Merge branch 'dormsbee/multicourse' of github.com:MITx/mitx into dormsbee/multicourse · 65e2de90
  John Jarvis committed Jul 10, 2012
  
  65e2de90 Browse Files
- updating rakefile so that starting gunicorn is non-fatal · ec47b72c
  John Jarvis committed Jul 10, 2012
  
  ec47b72c Browse Files
- typo fix (it was just really bugging me) · 3dd923d9
  David Ormsbee committed Jul 10, 2012
  
  3dd923d9 Browse Files
- Unscope URLCONF from mitx · 34748320
  Matthew Mongeau committed Jul 10, 2012
  
  34748320 Browse Files
- Add extra_filters_jinja needed for compressed_css filter · 1ac6e0a0
  Calen Pennington committed Jul 10, 2012
  
  1ac6e0a0 Browse Files
- Merge branch 'dormsbee/multicourse' of github.com:MITx/mitx into dormsbee/multicourse · a9eab86a
  Bridger Maxwell committed Jul 10, 2012
  
  a9eab86a Browse Files
- Make rake clobber remote test_root/*_repo directories that are used and should… · a7402468
```
Make rake clobber remote test_root/*_repo directories that are used and should be cleaned up by tests
```
  Calen Pennington committed Jul 10, 2012
  a7402468 Browse Files
- Make packaging task not verbose · 824f0492
  Calen Pennington committed Jul 10, 2012
  
  824f0492 Browse Files
- Fixing github_sync to work with multiple course data directories · 6dd14124
  Calen Pennington committed Jul 10, 2012
  
  6dd14124 Browse Files
- Merge · aff904a6
  Bridger Maxwell committed Jul 10, 2012
  
  aff904a6 Browse Files
- reorder requirements to make it a little easier to see django-related reqs · 8589a1d9
  David Ormsbee committed Jul 10, 2012
  
  8589a1d9 Browse Files
- add other django-* dependencies from my pip freeze results · caad217e
  David Ormsbee committed Jul 10, 2012
  
  caad217e Browse Files
- add django-keyedcache dependency · 15b0801e
  David Ormsbee committed Jul 10, 2012
  
  15b0801e Browse Files
- django-followit · 23f0bee8
  David Ormsbee committed Jul 10, 2012
  
  23f0bee8 Browse Files
- fix dependency for django-kombu · 9ec0ecdc
  David Ormsbee committed Jul 10, 2012
  
  9ec0ecdc Browse Files
- add djkombu dependency · fd7eec72
  David Ormsbee committed Jul 10, 2012
  
  fd7eec72 Browse Files
- add django-countries dependency · 78672776
  David Ormsbee committed Jul 10, 2012
  
  78672776 Browse Files
- add South dependency for migrations · efba36eb
  David Ormsbee committed Jul 10, 2012
  
  efba36eb Browse Files
- add pyparsing to requirements for capa lib · 56d87309
  David Ormsbee committed Jul 10, 2012
  
  56d87309 Browse Files
- Only load DATA_DIR subdirs if DATA_DIR exists (so not during tests) · 2f90b277
  David Ormsbee committed Jul 10, 2012
  
  2f90b277 Browse Files
- Merge remote-tracking branch 'origin/master' into dormsbee/multicourse · fdd96636
```
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	lms/djangoapps/courseware/views.py
	lms/templates/index.html
	lms/templates/info.html
	lms/templates/main.html
	lms/templates/navigation.html
	requirements.txt
```
  Calen Pennington committed Jul 10, 2012
  fdd96636 Browse Files
- Fix url in CapaModule error message · 74593d18
  Calen Pennington committed Jul 10, 2012
  
  74593d18 Browse Files
- Allow for a user to enroll in multiple courses · da360b1d
  Calen Pennington committed Jul 10, 2012
  
  da360b1d Browse Files
- Actually add the schematic.js file used in the main.html template · c4ebfe1b
  Calen Pennington committed Jul 10, 2012
  
  c4ebfe1b Browse Files
- Make /static/ urls work in the courseware · 5406b9bb
  Calen Pennington committed Jul 10, 2012
  
  5406b9bb Browse Files
- Get custom_tag templates using system.filestore so that they work in multicourse · dbfcd78c
  Calen Pennington committed Jul 10, 2012
  
  dbfcd78c Browse Files
- Require login for enrollment · 239c5ef1
  Calen Pennington committed Jul 10, 2012
  
  239c5ef1 Browse Files
- Fix typo · fe2f0347
  Calen Pennington committed Jul 10, 2012
  
  fe2f0347 Browse Files
- Add logging when info and about sections are missing · ad08df7a
  Calen Pennington committed Jul 10, 2012
  
  ad08df7a Browse Files
- Expect the proper error type when about or info sections aren't found · 3011f3f3
  Calen Pennington committed Jul 10, 2012
  
  3011f3f3 Browse Files
- Use course 'display_name' from metadata, and fall back to course id name if display_name is not set · 332ccb0b
  Calen Pennington committed Jul 10, 2012
  
  332ccb0b Browse Files
- Set defaults for org and course, and log error messages when they are used · 115a572f
  Calen Pennington committed Jul 10, 2012
  
  115a572f Browse Files
- Merge pull request #152 from MITx/ps-cms-backbone · 6965e006
```
Rewrite CMS JavaScript to use Backbone
```
  Calen Pennington committed Jul 10, 2012
  6965e006 Browse Files