Victor Shnayder fb350ed1e3 Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule ...

Feature/abarrett/annotatable xmodule DO NOT MERGE

2013-03-06 12:05:27 -08:00

..

models

Make discussion js work for cms as well as lms so that inline discussion xmodules load

2012-10-01 15:16:54 -04:00

views

Merge branch 'master' into feature/victor/revert-revert-of-forums-ui

2013-02-21 13:30:24 -05:00

content.coffee

Make discussion js work for cms as well as lms so that inline discussion xmodules load

2012-10-01 15:16:54 -04:00

discussion_filter.coffee

Make discussion js work for cms as well as lms so that inline discussion xmodules load

2012-10-01 15:16:54 -04:00

discussion_module_view.coffee

Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule

2013-03-06 12:05:27 -08:00

discussion_router.coffee

Make discussion js work for cms as well as lms so that inline discussion xmodules load

2012-10-01 15:16:54 -04:00

discussion.coffee

cohort filter almost done

2013-02-07 18:13:53 -05:00

main.coffee

Make discussion js work for cms as well as lms so that inline discussion xmodules load

2012-10-01 15:16:54 -04:00

templates.coffee

Make discussion js work for cms as well as lms so that inline discussion xmodules load

2012-10-01 15:16:54 -04:00

tooltip_manager.coffee

debugged tooltip latency/vanishing issue

2012-12-12 14:11:30 -05:00

user_profile.coffee

Make discussion js work for cms as well as lms so that inline discussion xmodules load

2012-10-01 15:16:54 -04:00

utils.coffee

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00