David Ormsbee aeee2791ea Merge remote-tracking branch 'rocky/master' into feature/dave/forum_fixes ...

Conflicts:
	lms/lib/comment_client/utils.py
	lms/templates/discussion/mustache/_content.mustache

2012-08-22 20:00:06 -04:00

..

__init__.py

replaced comment client sym link

2012-08-12 22:55:55 -07:00

comment_client.py

fixed tag autocomplete

2012-08-13 23:58:42 -07:00

comment.py

fixed autosubscribe

2012-08-22 14:11:19 -07:00

commentable.py

reply now works again

2012-08-13 23:23:13 -07:00

legacy.py

replaced comment client sym link

2012-08-12 22:55:55 -07:00

models.py

some progress

2012-08-20 23:43:47 -07:00

requirements.txt

replaced comment client sym link

2012-08-12 22:55:55 -07:00

settings.py

added shared key authentication

2012-08-21 15:45:41 -07:00

thread.py

fixed search highlighting

2012-08-22 12:04:32 -07:00

user.py

display active threads with only relevant contents

2012-08-15 00:46:28 -07:00

utils.py

Merge remote-tracking branch 'rocky/master' into feature/dave/forum_fixes

2012-08-22 20:00:06 -04:00