Chris Dodge e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge ...

Conflicts:
	requirements.txt

2013-01-03 10:46:24 -05: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 remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-10-23 13:38:11 -04: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

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_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

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

2012-10-01 15:16:54 -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

perform a new merge from master, resolve conflicts

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