Commits · 6847779f2203cd0b9a62978dc79e8d2eeed703b1 · edx / edx-platform · GitLab

26 Jan, 2013 4 commits
- Merge remote-tracking branch 'origin/master' into feature/victor/cohorts · 6847779f
```
Conflicts:
	common/djangoapps/student/models.py
```
  Victor Shnayder committed Jan 26, 2013
  6847779f Browse Files
- Merge pull request #1356 from MITx/feature/cale/fix-gemfile · d237e68a
```
Add a .ruby-version file for use w/ rbenv
```
  Calen Pennington committed Jan 25, 2013
  d237e68a Browse Files
- Add a .ruby-version file for use w/ rbenv · ad2dc8a3
  Calen Pennington committed Jan 26, 2013
  
  ad2dc8a3 Browse Files
- Fix versions in gemfile · 109689fe
  Calen Pennington committed Jan 26, 2013
  
  109689fe Browse Files
25 Jan, 2013 22 commits
- Merge pull request #1354 from MITx/feature/ichuang/fix-flashing-background-in-video · c07917d9
```
fix bug in video player:if from=xx:xx:xx is used then bkgrnd flashes
```
  David Ormsbee committed Jan 25, 2013
  c07917d9 Browse Files
- Merge pull request #1345 from MITx/feature/apenney/pearson-merge · ca28796a
```
Pearson export/import code. (No merging before 25th Jan)
```
  David Ormsbee committed Jan 25, 2013
  ca28796a Browse Files
- fix bug in video player:if from=xx:xx:xx is used then bkgrnd flashes · c56982e6
  ichuang committed Jan 25, 2013
  
  c56982e6 Browse Files
- Make all tests pass · 87e92644
```
caveat: with a bit of hackery.  Need to do better testing once things are live.
```
  Victor Shnayder committed Jan 25, 2013
  87e92644 Browse Files
- Merge pull request #1352 from MITx/feature/dhm/drag · 72c9d9f7
```
min height on droppable areas and add padding to top/bottom on hover.
```
  chrisndodge committed Jan 25, 2013
  72c9d9f7 Browse Files
- Fix some of the test bugs. Still more to fix. · 00dd3ad9
  Victor Shnayder committed Jan 25, 2013
  
  00dd3ad9 Browse Files
- studio - styled first children in an overview's subsection list for drag and drop work · 8a6dc040
  Brian Talbot committed Jan 25, 2013
  
  8a6dc040 Browse Files
- min height on droppable areas and add padding to top/bottom on hover. · 0009430b
  Don Mitchell committed Jan 25, 2013
  
  0009430b Browse Files
- Merge pull request #1336 from MITx/feature/dhm/drag · c9a877b7
```
unit/subsection/section drag and drop on overview page
```
  chrisndodge committed Jan 25, 2013
  c9a877b7 Browse Files
- fix regexp · d453a613
  Victor Shnayder committed Jan 25, 2013
  
  d453a613 Browse Files
- Merge pull request #1351 from MITx/content/rocha/most-important-change-ever · faaf290e
```
Added one more year!
```
  Victor Shnayder committed Jan 25, 2013
  faaf290e Browse Files
- whitespace · 76c47305
  Victor Shnayder committed Jan 25, 2013
  
  76c47305 Browse Files
- Address Dave's comments on https://github.com/MITx/mitx/pull/1350 · 66934ce2
  Victor Shnayder committed Jan 25, 2013
  
  66934ce2 Browse Files
- Added one more year! · f35d4a16
  Carlos Andrés Rocha committed Jan 25, 2013
  
  f35d4a16 Browse Files
- Updated comment · e58193f8
  Don Mitchell committed Jan 25, 2013
  
  e58193f8 Browse Files
- Remove old user replication code. · 3d303518
```
- we don't use it, and if we do want to change the arch, we should have a proper central user info service.
```
  Victor Shnayder committed Jan 25, 2013
  3d303518 Browse Files
- Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag · 45393ac6
  Don Mitchell committed Jan 25, 2013
  
  45393ac6 Browse Files
- Update jquery ui. Overrode draggable w/ an in place fix for scroll · 5ef3f3ee
```
racing condition.
```
  Don Mitchell committed Jan 25, 2013
  5ef3f3ee Browse Files
- This needs to be a list of strings. · a5477855
  Ashley Penney committed Jan 25, 2013
  
  a5477855 Browse Files
- Merge pull request #1349 from MITx/fix/cdodge/position-jumping-fix · 0e78d9eb
```
put back the 'position' argument to get_module() which got accidentially...
```
  Victor Shnayder committed Jan 24, 2013
  0e78d9eb Browse Files
- prep for staging · 07c1999a
  Kevin Chugh committed Jan 24, 2013
  
  07c1999a Browse Files
- put back the 'position' argument to get_module() which got accidentially - or so… · 1787157e
```
put back the 'position' argument to get_module() which got accidentially - or so I think - dropped in a previous commit
```
  Chris Dodge committed Jan 24, 2013
  1787157e Browse Files
24 Jan, 2013 14 commits
- turn forums on in test.py · 771a55a6
```
- this may not be a good idea, but needed for testing cohorts for now...
```
  Victor Shnayder committed Jan 24, 2013
  771a55a6 Browse Files
- the reverse isn't working for some reason... need to figure it out · d17aedf3
  Victor Shnayder committed Jan 24, 2013
  
  d17aedf3 Browse Files
- stub out django comment client test system · 0b7e7b35
  Victor Shnayder committed Jan 24, 2013
  
  0b7e7b35 Browse Files
- Some test cleanups · 22ccf9c5
  Victor Shnayder committed Jan 24, 2013
  
  22ccf9c5 Browse Files
- Merge pull request #1348 from MITx/fix/zoldak/ie-keyword · d3122936
```
Fix broken IE due to using the word function
```
  David Ormsbee committed Jan 24, 2013
  d3122936 Browse Files
- Fix broken IE · 896933a3
  Jay Zoldak committed Jan 24, 2013
  
  896933a3 Browse Files
- Fix inline discussion cohorting, debug logging · 69711a91
  Victor Shnayder committed Jan 24, 2013
  
  69711a91 Browse Files
- Merge branch 'feature/apenney/pearson-merge' of github.com:MITx/mitx into… · 368e3d5c
```
Merge branch 'feature/apenney/pearson-merge' of github.com:MITx/mitx into feature/apenney/pearson-merge
```
  Brian Wilson committed Jan 24, 2013
  368e3d5c Browse Files
- fix handling of rejected accommodations · 872f4b6c
  Brian Wilson committed Jan 24, 2013
  
  872f4b6c Browse Files
- Merge pull request #1347 from MITx/fix/cdodge/remove-duplicate-assign-default-role · acfafa65
```
fix merge problem. assign_default_role() ended up being defined twice as...
```
  David Ormsbee committed Jan 24, 2013
  acfafa65 Browse Files
- fix merge problem. assign_default_role() ended up being defined twice as that… · dfbe7dd4
```
fix merge problem. assign_default_role() ended up being defined twice as that code was added in both master and cms-master branches, but the merge didn't pick it up as a conflict
```
  Chris Dodge committed Jan 24, 2013
  dfbe7dd4 Browse Files
- oops--fix logging bug · fb7614a8
  Victor Shnayder committed Jan 24, 2013
  
  fb7614a8 Browse Files
- add logging, explicit check whether course is cohorted · ea3aebdf
  Victor Shnayder committed Jan 24, 2013
  
  ea3aebdf Browse Files
- Merge branch 'feature/apenney/pearson-merge' of github.com:MITx/mitx into… · 135369a3
```
Merge branch 'feature/apenney/pearson-merge' of github.com:MITx/mitx into feature/apenney/pearson-merge
```
  Ashley Penney committed Jan 24, 2013
  135369a3 Browse Files