Commits · c89e290cdd5e2cd70a0506af7861b83c01729cda · edx / edx-platform · GitLab

16 Aug, 2012 3 commits
- use only one conf param · c89e290c
  Rocky Duan committed Aug 16, 2012
  
  c89e290c Browse Files
- add askbot flag back · 730d4d94
  Rocky Duan committed Aug 16, 2012
  
  730d4d94 Browse Files
- fixed vote permission · 449da71c
  Rocky Duan committed Aug 15, 2012
  
  449da71c Browse Files
15 Aug, 2012 28 commits
- Merge branch 'ccp0101/performance' of github.com:dementrock/mitx · 051afcca
  Rocky Duan committed Aug 15, 2012
  
  051afcca Browse Files
- callback for models · 1a92cc5c
  Rocky Duan committed Aug 15, 2012
  
  1a92cc5c Browse Files
- added comment · d56ac9a7
  Mike Chen committed Aug 15, 2012
  
  d56ac9a7 Browse Files
- added naive caching. not sure how to expire. · 158e978a
  Mike Chen committed Aug 15, 2012
  
  158e978a Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance · 2454c06b
  Mike Chen committed Aug 15, 2012
  
  2454c06b Browse Files
- updated doc · 72c3ad2a
  Rocky Duan committed Aug 15, 2012
  
  72c3ad2a Browse Files
- slight styling adjustment · f7f61643
  Rocky Duan committed Aug 15, 2012
  
  f7f61643 Browse Files
- updated documentation · f5251249
  Rocky Duan committed Aug 15, 2012
  
  f5251249 Browse Files
- show all content in a course in the forum view · 7335c152
  Rocky Duan committed Aug 15, 2012
  
  7335c152 Browse Files
- added QueryCountDebugMiddleware · b4621d05
  Mike Chen committed Aug 15, 2012
  
  b4621d05 Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance · 7c22a39a
```
Conflicts:
	common/lib/xmodule/xmodule/discussion_module.py
	lms/djangoapps/django_comment_client/forum/views.py
	lms/templates/discussion/_thread.html
	lms/urls.py
```
  Mike Chen committed Aug 15, 2012
  7c22a39a Browse Files
- can retrieve all comments · 00ff1b94
  Rocky Duan committed Aug 15, 2012
  
  00ff1b94 Browse Files
- display active threads with only relevant contents · e5fe54ca
  Rocky Duan committed Aug 15, 2012
  
  e5fe54ca Browse Files
- fixed merge bug · 9ef1a11c
  Rocky Duan committed Aug 14, 2012
  
  9ef1a11c Browse Files
- Merge branch 'master' of github.com:MITx/mitx into merge · 449d665b
  Rocky Duan committed Aug 14, 2012
  
  449d665b Browse Files
- fixed permalink · 30877250
  Rocky Duan committed Aug 14, 2012
  
  30877250 Browse Files
- Merge branch 'brittany' of github.com:dementrock/mitx into merge · b68a69cd
  Rocky Duan committed Aug 14, 2012
  
  b68a69cd Browse Files
- fixed openclose thread · ea07d069
  Rocky Duan committed Aug 14, 2012
  
  ea07d069 Browse Files
- edit panel styles · b9875b80
  Brittany Cheng committed Aug 14, 2012
  
  b9875b80 Browse Files
- Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge · 5009b781
```
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/djangoapps/django_comment_client/permissions.py
	lms/static/coffee/src/discussion/content.coffee
	lms/static/coffee/src/discussion/utils.coffee
	lms/templates/discussion/_recent_active_posts.html
	lms/templates/discussion/_search_bar.html
	lms/templates/discussion/_thread.html
	lms/templates/discussion/_trending_tags.html
	lms/urls.py
```
  Rocky Duan committed Aug 14, 2012
  5009b781 Browse Files
- style fixes · 46f2407e
  Brittany Cheng committed Aug 14, 2012
  
  46f2407e Browse Files
- style fixes · f20659f5
  Brittany Cheng committed Aug 14, 2012
  
  f20659f5 Browse Files
- Merge branch 'brittany' of github.com:dementrock/mitx into profile · 00775a05
  Rocky Duan committed Aug 14, 2012
  
  00775a05 Browse Files
- similar post and search highlight · 6d249726
  Brittany Cheng committed Aug 14, 2012
  
  6d249726 Browse Files
- Merge branch 'brittany' of github.com:dementrock/mitx into profile · a701e703
  Rocky Duan committed Aug 14, 2012
  
  a701e703 Browse Files
- similar post and search highlight · 623b82ee
  Brittany Cheng committed Aug 14, 2012
  
  623b82ee Browse Files
- fixed similar posts suggestion · d0a339be
  Rocky Duan committed Aug 14, 2012
  
  d0a339be Browse Files
- Merge branch 'profile' of github.com:dementrock/mitx into brittany · 8d492bbd
  Brittany Cheng committed Aug 14, 2012
  
  8d492bbd Browse Files
14 Aug, 2012 9 commits
- confirm before changing moderator status · dd80cbc4
  Rocky Duan committed Aug 14, 2012
  
  dd80cbc4 Browse Files
- Merge branch 'brittany' of github.com:dementrock/mitx into profile & · 70059426
```
small fix

Conflicts:
	lms/templates/discussion/user_profile.html
```
  Rocky Duan committed Aug 14, 2012
  70059426 Browse Files
- toggle moderator status · 457b7f46
  Rocky Duan committed Aug 14, 2012
  
  457b7f46 Browse Files
- Merge branch 'profile' of github.com:dementrock/mitx into brittany · f457381b
  Brittany Cheng committed Aug 14, 2012
  
  f457381b Browse Files
- removed debug line · 97f1e2f5
  Rocky Duan committed Aug 14, 2012
  
  97f1e2f5 Browse Files
- moderator styles · f983867e
  Brittany Cheng committed Aug 14, 2012
  
  f983867e Browse Files
- added administrator role · eef24a5e
  Rocky Duan committed Aug 14, 2012
  
  eef24a5e Browse Files
- fixed bug caused by missing course_id in retrieved comments · 529c3237
  Rocky Duan committed Aug 14, 2012
  
  529c3237 Browse Files
- small bug fix · d4f024ed
  Rocky Duan committed Aug 14, 2012
  
  d4f024ed Browse Files