Ibrahim Awwal 939b927fbd Merge branch 'master' into feature/ibrahim/followed-threads ...

Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py

2012-09-20 23:55:13 -07: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

Remove more tags; anonymity to peers

2012-09-14 02:50:08 -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

read the comment service shared key from django config

2012-08-23 08:02:19 -04:00

thread.py

Alter some css; don't send the user if there is no user when retrieivng a thread

2012-09-20 02:11:27 -07:00

user.py

Alter some css; don't send the user if there is no user when retrieivng a thread

2012-09-20 02:11:27 -07:00

utils.py

Merge master

2012-09-10 15:33:59 -07:00