Commits · 6dd141247d9fa06de7a36a91220fb6db70b66bb5 · edx / edx-platform · GitLab

10 Jul, 2012 27 commits
- Fixing github_sync to work with multiple course data directories · 6dd14124
  Calen Pennington committed Jul 10, 2012
  
  6dd14124 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
- Merge remote-tracking branch 'origin/master' into ps-cms-backbone · 6d246f06
```
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
  6d246f06 Browse Files
- Merge pull request #157 from MITx/cpennington/cms-github · ed0053ef
```
Enable interaction with github
```
  Calen Pennington committed Jul 10, 2012
  ed0053ef Browse Files
- Merge remote-tracking branch 'origin/master' into cpennington/cms-github · cfd6890d
```
Conflicts:
	common/lib/xmodule/xmodule/xml_module.py
```
  Calen Pennington committed Jul 10, 2012
  cfd6890d Browse Files
09 Jul, 2012 13 commits
- Made data identifiers consistent with master branch of 'content-mit-6002x' · 024789da
  kimth committed Jul 09, 2012
  
  024789da Browse Files
- Change url to use args instead of kwargs. · cfa389e3
  Matthew Mongeau committed Jul 09, 2012
  
  cfa389e3 Browse Files
- Undo forced CourseDescriptor · ff74bc79
  Matthew Mongeau committed Jul 09, 2012
  
  ff74bc79 Browse Files
- Pass a course to get_section · 1fcc0257
  Matthew Mongeau committed Jul 09, 2012
  
  1fcc0257 Browse Files
- Get initial courseware page displaying. · 51c65e21
  Matthew Mongeau committed Jul 09, 2012
  
  51c65e21 Browse Files
- Get textbook page rendering. · fe5fa733
  Matthew Mongeau committed Jul 09, 2012
  
  fe5fa733 Browse Files
- Added info page content · 43e6bbb2
  Matthew Mongeau committed Jul 09, 2012
  
  43e6bbb2 Browse Files
- Fix some path problems. · c47cdc7f
  Matthew Mongeau committed Jul 09, 2012
  
  c47cdc7f Browse Files
- Get course about page working. · 3053caec
  Matthew Mongeau committed Jul 09, 2012
  
  3053caec Browse Files
- Merge pull request #161 from MITx/kf-cms-style · 72a3c0f7
```
Kf cms style
```
  kylefiedler committed Jul 09, 2012
  72a3c0f7 Browse Files
- Fixed overflow and fixed hover on new module · 6f40b464
  Kyle Fiedler committed Jul 09, 2012
  
  6f40b464 Browse Files
- Got courses page working... mostly. · 949efb62
  Matthew Mongeau committed Jul 09, 2012
  
  949efb62 Browse Files
- put normalize in vendor folder · 8a4d860a
  Kyle Fiedler committed Jul 09, 2012
  
  8a4d860a Browse Files