Diana Huang 2df3fe9344 Revert "fix merge conflict" ...

This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.

2013-04-26 12:40:35 -04: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

Revert "fix merge conflict"

2013-04-26 12:40:35 -04:00

content.coffee

Revert "fix merge conflict"

2013-04-26 12:40:35 -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

Revert "fix merge conflict"

2013-04-26 12:40:35 -04: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

Revert "fix merge conflict"

2013-04-26 12:40:35 -04:00