Commits · 0ace2ee36427151cefd36592c61037f3a6080cb9 · edx / edx-platform · GitLab

20 Jun, 2012 2 commits
- Merge pull request #122 from MITx/cpennington/cms-review-cleanup · 0ace2ee3
```
Cleanup from https://github.com/MITx/mitx/pull/120
```
  Calen Pennington committed Jun 20, 2012
  0ace2ee3 Browse Files
- Add note about optional revision in location · ed6a658a
  Calen Pennington committed Jun 20, 2012
  
  ed6a658a Browse Files
19 Jun, 2012 16 commits
- Merge pull request #123 from MITx/ps-update-jquery · 8e05116d
```
Update jQuery and jQuery-UI to latest version
```
  Calen Pennington committed Jun 19, 2012
  8e05116d Browse Files
- Update jQuery and jQuery-UI to latest version · afaed831
  Prem Sichanugrist committed Jun 19, 2012
  
  afaed831 Browse Files
- Add comment about None in Locations · 28237273
  Calen Pennington committed Jun 19, 2012
  
  28237273 Browse Files
- Remove extra word in doc string · 47bf71ae
  Calen Pennington committed Jun 19, 2012
  
  47bf71ae Browse Files
- Remove reference to instructor module · b91a1d48
  Calen Pennington committed Jun 19, 2012
  
  b91a1d48 Browse Files
- Change name of XModuleSystem to DescriptorSystem at usage sites · 7914bacc
  Calen Pennington committed Jun 19, 2012
  
  7914bacc Browse Files
- Cleanup intertwined descriptor and keystore code · 6fb35c47
  Calen Pennington committed Jun 19, 2012
  
  6fb35c47 Browse Files
- Add documentation of mongo query syntax usage · 5562def5
  Calen Pennington committed Jun 19, 2012
  
  5562def5 Browse Files
- Remove unused code · 677c25ee
  Calen Pennington committed Jun 19, 2012
  
  677c25ee Browse Files
- Remove unused urls · 58085f8e
  Calen Pennington committed Jun 19, 2012
  
  58085f8e Browse Files
- Fix string layout for readability · 6daa0f1a
  Calen Pennington committed Jun 19, 2012
  
  6daa0f1a Browse Files
- Cleanup and test Location, and add the ability to specify a revision · f1ffff1d
  Calen Pennington committed Jun 19, 2012
  
  f1ffff1d Browse Files
- Get rid of references to askbot · 703103e7
  Calen Pennington committed Jun 19, 2012
  
  703103e7 Browse Files
- Search for course specifically in navigation view · 0379d1cb
  Calen Pennington committed Jun 19, 2012
  
  0379d1cb Browse Files
- Conform to new TODO standards · 199f94aa
  Calen Pennington committed Jun 19, 2012
  
  199f94aa Browse Files
- Merge pull request #121 from MITx/pmitros/documentation · fb0deb99
```
Rapid merge procedure
```
  Calen Pennington committed Jun 19, 2012
  fb0deb99 Browse Files
18 Jun, 2012 22 commits
- Documentation for rapid merge · 25834412
  Piotr Mitros committed Jun 18, 2012
  
  25834412 Browse Files
- Rapid pull/history · e108c2cd
  Piotr Mitros committed Jun 18, 2012
  
  e108c2cd Browse Files
- Merge branch 'master' into pmitros/documentation · 7700a9d0
  Piotr Mitros committed Jun 18, 2012
  
  7700a9d0 Browse Files
- Code standards · 8bad7dc9
  Piotr Mitros committed Jun 18, 2012
  
  8bad7dc9 Browse Files
- Merge pull request #120 from MITx/cpennington/cms · ef6630d7
```
CMS Beginnings
```
  Calen Pennington committed Jun 18, 2012
  ef6630d7 Browse Files
- Remove old template that is no longer relevant · 605b1ae0
  Calen Pennington committed Jun 18, 2012
  
  605b1ae0 Browse Files
- Remove copy/paste instructor module. It was a bad idea anyway. =) · 9ff0effd
  Calen Pennington committed Jun 18, 2012
  
  9ff0effd Browse Files
- Move libraries that can only be imported in the context of django into common/djangoapps · f8434b3a
  Calen Pennington committed Jun 18, 2012
  
  f8434b3a Browse Files
- Merge branch 'master' into cpennington/cms · 34a696cd
```
Conflicts:
	rakefile
	requirements.txt
```
  Calen Pennington committed Jun 18, 2012
  34a696cd Browse Files
- Delay initializition of the MongoKeyStore until required · 79e81d69
  Calen Pennington committed Jun 18, 2012
  
  79e81d69 Browse Files
- Merge pull request #119 from MITx/victor/render-path-cleanup · 51cd7566
```
put lambda function back in, as requested during code review
```
  Calen Pennington committed Jun 18, 2012
  51cd7566 Browse Files
- Make tests pass when running on cms · 5404345b
  Calen Pennington committed Jun 18, 2012
  
  5404345b Browse Files
- put lambda function back in, as requested during code review · 7e73f0ed
  Victor Shnayder committed Jun 18, 2012
  
  7e73f0ed Browse Files
- Ignore .egg-info directories · 328b2df7
  Calen Pennington committed Jun 18, 2012
  
  328b2df7 Browse Files
- Merge pull request #118 from MITx/victor/render-path-cleanup · 4ce08cc3
```
Small cleanups in response to Calen + Piotr's comments
```
  Calen Pennington committed Jun 18, 2012
  4ce08cc3 Browse Files
- Merge pull request #43 from MITx/pmitros/same-values · 5ae2668e
```
Courseware can have same random seed in multiple problems for exam. 
```
  Calen Pennington committed Jun 18, 2012
  5ae2668e Browse Files
- Courseware can have same random seed in multiple problems for exam. Slight hack. · f391e9c5
  Piotr Mitros committed Jun 18, 2012
  
  f391e9c5 Browse Files
- Small cleanups in response to Calen + Piotr's comments · 96cbb3d3
  Victor Shnayder committed Jun 18, 2012
  
  96cbb3d3 Browse Files
- Merge pull request #105 from MITx/ps-video-volume · 40a950f1
```
Add video volume control to video player
```
  Calen Pennington committed Jun 18, 2012
  40a950f1 Browse Files
- Merge pull request #116 from MITx/victor/render-path-cleanup · b344e51c
```
Victor/render path cleanup
```
  Calen Pennington committed Jun 18, 2012
  b344e51c Browse Files
- Add categories and XModuleDescriptors for all module types that are used at the… · e67dfb70
```
Add categories and XModuleDescriptors for all module types that are used at the top level of a course
```
  Calen Pennington committed Jun 18, 2012
  e67dfb70 Browse Files
- Read week headings from mongodb · fe45de38
  Calen Pennington committed Jun 18, 2012
  
  fe45de38 Browse Files