Commits · fb777de18d50ed9c84b6e44141bcd9b61e55ca62 · edx / edx-platform · GitLab

04 Feb, 2013 31 commits
- Merge pull request #1401 from MITx/feature/vik/peer-grading-flagging · fb777de1
```
Feature/vik/peer grading flagging
```
  Diana Huang committed Feb 04, 2013
  fb777de1 Browse Files
- Fix accidental commit of dev.py · 1dab4aba
  Vik Paruchuri committed Feb 04, 2013
  
  1dab4aba Browse Files
- Fix JS on after event handling · e8803985
  Vik Paruchuri committed Feb 04, 2013
  
  e8803985 Browse Files
- Merge pull request #1419 from MITx/debug/dave/sass · 4999a8e9
```
Remove compressed flag from SASS call in pipeline so we can diff the gen...
```
  David Ormsbee committed Feb 04, 2013
  4999a8e9 Browse Files
- Remove compressed flag from SASS call in pipeline so we can diff the generated CSS · 9f634aba
  David Ormsbee committed Feb 04, 2013
  
  9f634aba Browse Files
- Fix a function call · d89ab000
  Vik Paruchuri committed Feb 04, 2013
  
  d89ab000 Browse Files
- Fix reloading · f019225d
  Vik Paruchuri committed Feb 04, 2013
  
  f019225d Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging · eb049bda
  Vik Paruchuri committed Feb 04, 2013
  
  eb049bda Browse Files
- Address review comments · 7f96fbb3
  Vik Paruchuri committed Feb 04, 2013
  
  7f96fbb3 Browse Files
- Merge pull request #1418 from MITx/feature/ichuang/conditional-xmodule-fix-display · d7570de5
```
fix bug in conditional - videos were not playing, because a js function changed syntax
```
  Victor Shnayder committed Feb 04, 2013
  d7570de5 Browse Files
- XModule.loadModules only takes @el as argument now · 0c07f03d
  ichuang committed Feb 04, 2013
  
  0c07f03d Browse Files
- Merge pull request #1417 from MITx/feature/christina/misc2 · 2306e7c1
```
Try, try again.
```
  Christina Roberts committed Feb 04, 2013
  2306e7c1 Browse Files
- Merge pull request #1416 from MITx/feature/dhm/dnd · 43c2acdb
```
Brian's CSS updates.
```
  Christina Roberts committed Feb 04, 2013
  43c2acdb Browse Files
- Try, try again. · aac179f1
  cahrens committed Feb 04, 2013
  
  aac179f1 Browse Files
- Merge pull request #1414 from MITx/feature/victor/showanswer-past-due · 25bede90
```
Feature/victor/showanswer past due
```
  Sarina committed Feb 04, 2013
  25bede90 Browse Files
- fix typo, add comment · fe42d8e9
  Victor Shnayder committed Feb 04, 2013
  
  fe42d8e9 Browse Files
- studio - resolved safari/webkit display issue with unit editing window's wrapper background color · ffd585ae
  Brian Talbot committed Feb 04, 2013
  
  ffd585ae Browse Files
- studio - overview drag and drop: removed unused scss and hid new unit button while dragging · 6ca55b84
  Brian Talbot committed Feb 04, 2013
  
  6ca55b84 Browse Files
- Merge pull request #1413 from MITx/feature/christina/misc2 · 517f756f
```
See if this helps with the tab-changing race condition.
```
  Christina Roberts committed Feb 04, 2013
  517f756f Browse Files
- See if this helps with the tab-changing race condition. · 39479d9e
  cahrens committed Feb 04, 2013
  
  39479d9e Browse Files
- Merge pull request #1411 from MITx/feature/dhm/dnd · be5dd6d2
```
Attempt to patch the dnd hesitation fixes onto master
```
  Christina Roberts committed Feb 04, 2013
  be5dd6d2 Browse Files
- Merge pull request #1407 from MITx/feature/ichuang/conditional-xmodule-v2 · 486e747b
```
 Provides "stop" feature via a new "conditional" XModule
```
  Victor Shnayder committed Feb 04, 2013
  486e747b Browse Files
- Merge pull request #1412 from MITx/feature/jarv/service-variant-default · 723f47f4
```
Defaulting service_variant to a blank string
```
  jarv committed Feb 04, 2013
  723f47f4 Browse Files
- Added comments for unused 2nd arg on generateCheckHoverState · 902cdefe
  Don Mitchell committed Feb 04, 2013
  
  902cdefe Browse Files
- Defaulting service_variant to a blank string · 7c39e385
  John Jarvis committed Feb 04, 2013
  
  7c39e385 Browse Files
- Attempt to patch the dnd hesitation fixes onto master · 50eced5b
  Don Mitchell committed Feb 04, 2013
  
  50eced5b Browse Files
- Add in key to mock peer grading service · 8bd7b60a
  Vik Paruchuri committed Feb 04, 2013
  
  8bd7b60a Browse Files
- Fix open ended test with flagging · c991c048
  Vik Paruchuri committed Feb 04, 2013
  
  c991c048 Browse Files
- Merge pull request #1406 from MITx/bug/bug152 · a6e0fb91
```
Move dnd code from base.js to a js file only loaded by overview.html
```
  Christina Roberts committed Feb 04, 2013
  a6e0fb91 Browse Files
- add docs for conditional module; clean up a bit more · e59b0b87
  ichuang committed Feb 03, 2013
  
  e59b0b87 Browse Files
- cleaned up conditional module a bit; add test for conditional module · 4446ddb2
  ichuang committed Feb 03, 2013
  
  4446ddb2 Browse Files
03 Feb, 2013 6 commits
- extend conditional module to add require_attempted · 95ef1216
  ichuang committed Feb 03, 2013
  
  95ef1216 Browse Files
- comment out some debug in conditional_module; leave undeleted for future tests · 1d29e1f2
  ichuang committed Feb 03, 2013
  
  1d29e1f2 Browse Files
- add coffeescript/js for conditional module, does XModule.loadModules · 363ca703
  ichuang committed Feb 03, 2013
  
  363ca703 Browse Files
- use ajax for doing conditional_module · 19051e40
  ichuang committed Feb 03, 2013
  
  19051e40 Browse Files
- conditional_module.html · 8db96abb
  ichuang committed Feb 03, 2013
  
  8db96abb Browse Files
- initial implementation of conditional_module; doesn't load dynamically yet · 95b81347
  ichuang committed Feb 03, 2013
  
  95b81347 Browse Files
01 Feb, 2013 3 commits
- Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes · 01fab2ec
```
Feature/vik/combined xmodule changes
```
  VikParuchuri committed Feb 01, 2013
  01fab2ec Browse Files
- Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging · d9517877
  Vik Paruchuri committed Feb 01, 2013
  
  d9517877 Browse Files
- Remove reload test · 9310dcbe
  Vik Paruchuri committed Feb 01, 2013
  
  9310dcbe Browse Files