Commits · c7a133470d42bf9aa11d682a729450ffbe233231 · edx / edx-platform · GitLab

06 Feb, 2013 1 commit
- inline discussions working · c7a13347
  Kevin Chugh committed Feb 05, 2013
  
  c7a13347 Browse Files
05 Feb, 2013 2 commits
- inline cohorting working · d5b70d7b
  Your Name committed Feb 05, 2013
  
  d5b70d7b Browse Files
- inline cohorting almost done · 837f54c0
  Your Name committed Feb 04, 2013
  
  837f54c0 Browse Files
04 Feb, 2013 25 commits
- Merge branch 'feature/kevin/groups_ui_changes' of github.com:MITx/mitx into… · a8a99759
```
Merge branch 'feature/kevin/groups_ui_changes' of github.com:MITx/mitx into feature/kevin/groups_ui_changes
```
  Your Name committed Feb 04, 2013
  a8a99759 Browse Files
- Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes · 6e8e74aa
  Your Name committed Feb 04, 2013
  
  6e8e74aa Browse Files
- move group logic to get_threads · f7ba14ae
  Kevin Chugh committed Feb 04, 2013
  
  f7ba14ae 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
- showing group names · 3009acbb
  Kevin Chugh committed Feb 04, 2013
  
  3009acbb 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 github.com:MITx/mitx into feature/kevin/groups_ui_changes · 7a3798f2
  Your Name committed Feb 04, 2013
  
  7a3798f2 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 github.com:MITx/mitx into feature/kevin/groups_ui_changes · bdfc9d97
  Your Name committed Feb 04, 2013
  
  bdfc9d97 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
- 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
- cohort ID showing, have to translate to display text · 69225f64
  Kevin Chugh committed Feb 04, 2013
  
  69225f64 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
02 Feb, 2013 1 commit
- produce and consume group_id from dropdowns · fcbd4bd1
  Kevin Chugh committed Feb 02, 2013
  
  fcbd4bd1 Browse Files
01 Feb, 2013 5 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
- Remove reload test · 9310dcbe
  Vik Paruchuri committed Feb 01, 2013
  
  9310dcbe Browse Files
- Move dnd code from base.js to a js file only loaded by overview.html · 1595bd9b
  Don Mitchell committed Feb 01, 2013
  
  1595bd9b Browse Files
- Fix JS tests · b609bbee
  Vik Paruchuri committed Feb 01, 2013
  
  b609bbee Browse Files
- For prod environments only log info and up · 1c09d9ca
  John Jarvis committed Feb 01, 2013
  
  1c09d9ca Browse Files