Commits · f1526efe1d4743640b132c750d6e947fc5965b8a · edx / edx-platform · GitLab

10 Jul, 2012 33 commits
- updating rakefile so that starting gunicorn is non-fatal · f1526efe
  John Jarvis committed Jul 10, 2012
  
  f1526efe Browse Files
- Add extra_filters_jinja needed for compressed_css filter · ab86e8d5
  Calen Pennington committed Jul 10, 2012
  
  ab86e8d5 Browse Files
- Merge branch 'dormsbee/multicourse' of github.com:MITx/mitx into dormsbee/multicourse · 570310a8
  Bridger Maxwell committed Jul 10, 2012
  
  570310a8 Browse Files
- Make rake clobber remote test_root/*_repo directories that are used and should… · 7bcd7cbb
```
Make rake clobber remote test_root/*_repo directories that are used and should be cleaned up by tests
```
  Calen Pennington committed Jul 10, 2012
  7bcd7cbb Browse Files
- Make packaging task not verbose · d2bfdef5
  Calen Pennington committed Jul 10, 2012
  
  d2bfdef5 Browse Files
- Fixing github_sync to work with multiple course data directories · ba1554b1
  Calen Pennington committed Jul 10, 2012
  
  ba1554b1 Browse Files
- Merge · ed015439
  Bridger Maxwell committed Jul 10, 2012
  
  ed015439 Browse Files
- reorder requirements to make it a little easier to see django-related reqs · 016ac5d9
  David Ormsbee committed Jul 10, 2012
  
  016ac5d9 Browse Files
- add other django-* dependencies from my pip freeze results · 81e85cac
  David Ormsbee committed Jul 10, 2012
  
  81e85cac Browse Files
- add django-keyedcache dependency · 59cb9e2c
  David Ormsbee committed Jul 10, 2012
  
  59cb9e2c Browse Files
- django-followit · 4a2cb43d
  David Ormsbee committed Jul 10, 2012
  
  4a2cb43d Browse Files
- fix dependency for django-kombu · d3fea410
  David Ormsbee committed Jul 10, 2012
  
  d3fea410 Browse Files
- add djkombu dependency · b92c58f3
  David Ormsbee committed Jul 10, 2012
  
  b92c58f3 Browse Files
- add django-countries dependency · 1acbe329
  David Ormsbee committed Jul 10, 2012
  
  1acbe329 Browse Files
- add South dependency for migrations · 2db69ccd
  David Ormsbee committed Jul 10, 2012
  
  2db69ccd Browse Files
- add pyparsing to requirements for capa lib · 1d86a77d
  David Ormsbee committed Jul 10, 2012
  
  1d86a77d Browse Files
- Only load DATA_DIR subdirs if DATA_DIR exists (so not during tests) · 9acd7a93
  David Ormsbee committed Jul 10, 2012
  
  9acd7a93 Browse Files
- Merge remote-tracking branch 'origin/master' into dormsbee/multicourse · 7f3a5d02
```
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
  7f3a5d02 Browse Files
- Fix url in CapaModule error message · 90b3f681
  Calen Pennington committed Jul 10, 2012
  
  90b3f681 Browse Files
- Allow for a user to enroll in multiple courses · 73b906ef
  Calen Pennington committed Jul 10, 2012
  
  73b906ef Browse Files
- Actually add the schematic.js file used in the main.html template · 9220d138
  Calen Pennington committed Jul 10, 2012
  
  9220d138 Browse Files
- Make /static/ urls work in the courseware · 2a23a7f6
  Calen Pennington committed Jul 10, 2012
  
  2a23a7f6 Browse Files
- Get custom_tag templates using system.filestore so that they work in multicourse · d73599a2
  Calen Pennington committed Jul 10, 2012
  
  d73599a2 Browse Files
- Require login for enrollment · e273c229
  Calen Pennington committed Jul 10, 2012
  
  e273c229 Browse Files
- Fix typo · 09555815
  Calen Pennington committed Jul 10, 2012
  
  09555815 Browse Files
- Add logging when info and about sections are missing · 067051aa
  Calen Pennington committed Jul 10, 2012
  
  067051aa Browse Files
- Expect the proper error type when about or info sections aren't found · f3a58324
  Calen Pennington committed Jul 10, 2012
  
  f3a58324 Browse Files
- Use course 'display_name' from metadata, and fall back to course id name if display_name is not set · 29fc851c
  Calen Pennington committed Jul 10, 2012
  
  29fc851c Browse Files
- Set defaults for org and course, and log error messages when they are used · f7f93b4c
  Calen Pennington committed Jul 10, 2012
  
  f7f93b4c Browse Files
- Merge pull request #152 from MITx/ps-cms-backbone · b73b9ee3
```
Rewrite CMS JavaScript to use Backbone
```
  Calen Pennington committed Jul 10, 2012
  b73b9ee3 Browse Files
- Merge remote-tracking branch 'origin/master' into ps-cms-backbone · 58ee8690
```
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/coffee/unit.coffee
	cms/templates/index.html
	cms/templates/widgets/sequence-edit.html
```
  Calen Pennington committed Jul 10, 2012
  58ee8690 Browse Files
- Merge pull request #157 from MITx/cpennington/cms-github · d0cd5fe6
```
Enable interaction with github
```
  Calen Pennington committed Jul 10, 2012
  d0cd5fe6 Browse Files
- Merge remote-tracking branch 'origin/master' into cpennington/cms-github · 574c55e4
```
Conflicts:
	common/lib/xmodule/xmodule/xml_module.py
```
  Calen Pennington committed Jul 10, 2012
  574c55e4 Browse Files
09 Jul, 2012 7 commits
- Made data identifiers consistent with master branch of 'content-mit-6002x' · 661301ac
  kimth committed Jul 09, 2012
  
  661301ac Browse Files
- Change url to use args instead of kwargs. · 9232817d
  Matthew Mongeau committed Jul 09, 2012
  
  9232817d Browse Files
- Undo forced CourseDescriptor · 9d6b3c17
  Matthew Mongeau committed Jul 09, 2012
  
  9d6b3c17 Browse Files
- Pass a course to get_section · 0ccbf046
  Matthew Mongeau committed Jul 09, 2012
  
  0ccbf046 Browse Files
- Fixed exception type when about or info section missing. · b4e61130
  Bridger Maxwell committed Jul 09, 2012
  
  b4e61130 Browse Files
- Get initial courseware page displaying. · 578fc915
  Matthew Mongeau committed Jul 09, 2012
  
  578fc915 Browse Files
- Get textbook page rendering. · 3de3f527
  Matthew Mongeau committed Jul 09, 2012
  
  3de3f527 Browse Files