Commits · fb0deb9971073aacb3d5c54a06cb6f3b952a98fd · edx / edx-platform · GitLab

19 Jun, 2012 1 commit
- 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
15 Jun, 2012 5 commits
- Clean and refactor courseware/views.py and module_render.py · e061e864
```
* Refactor index() so that it makes sense to me and hopefully others :)
* Rename preloaded cache of student modules to student_module_cache
* Fix line length and whitespace throughout
* add docstrings and other comments
* a few behavior-preserving tweaks to the code to make it clearer.
* Separate codepaths for with-module and without-module in index view
* Remove default chapter + section, since they don't exist anyway in course.xml
```
  Victor Shnayder committed Jun 15, 2012
  e061e864 Browse Files
- added rednose to requirements (adds color output to nose) · 15ac5753
  Victor Shnayder committed Jun 15, 2012
  
  15ac5753 Browse Files
- fix typo in comment in student view · 5ad2824c
  Victor Shnayder committed Jun 15, 2012
  
  5ad2824c Browse Files
- Added more styles and markup for sequence · cb1f6838
  Kyle Fiedler committed Jun 15, 2012
  
  cb1f6838 Browse Files
- Added scratch on the calendar view and added handles on the calendar view · 93478d53
  Kyle Fiedler committed Jun 15, 2012
  
  93478d53 Browse Files
14 Jun, 2012 5 commits
- Added more styels to the section view and default section view · 57b605db
  Kyle Fiedler committed Jun 14, 2012
  
  57b605db Browse Files
- Successfully read course children out of mongodb · 6fee7928
  Calen Pennington committed Jun 14, 2012
  
  6fee7928 Browse Files
- Merge pull request #104 from MITx/ps-fix-feedback-calculator · 788321be
```
Create Calculator and Feedback form on every page
```
  Calen Pennington committed Jun 14, 2012
  788321be Browse Files
- Use existential operator · 01ca4334
  Prem Sichanugrist committed Jun 14, 2012
  
  01ca4334 Browse Files
- Continued on week view styles · 3eb7c69b
  Kyle Fiedler committed Jun 14, 2012
  
  3eb7c69b Browse Files
13 Jun, 2012 7 commits
- Added volume images · ed69957f
  Kyle Fiedler committed Jun 13, 2012
  
  ed69957f Browse Files
- Added some styles to clean up volume slider · b97f82df
  Kyle Fiedler committed Jun 13, 2012
  
  b97f82df Browse Files
- Make sure we don't show volume control on iOS · 98ed7384
  Prem Sichanugrist committed Jun 13, 2012
  
  98ed7384 Browse Files
- Add video volume control to video player · 7924e5c8
  Prem Sichanugrist committed Jun 13, 2012
  
  7924e5c8 Browse Files
- Be specific on video progress slider handle · e1456395
```
Using `.ui-slider-handle` was too broad.
```
  Prem Sichanugrist committed Jun 13, 2012
  e1456395 Browse Files
- Added sass readme · d96d982a
  Kyle Fiedler committed Jun 13, 2012
  
  d96d982a Browse Files
- Create Calculator and Feedback form on every page · 0f073f70
  Prem Sichanugrist committed Jun 13, 2012
  
  0f073f70 Browse Files