Rocky Duan
|
449da71cd9
|
fixed vote permission
|
2012-08-15 18:04:56 -07:00 |
|
Rocky Duan
|
051afcca6a
|
Merge branch 'ccp0101/performance' of github.com:dementrock/mitx
|
2012-08-15 15:47:25 -07:00 |
|
Rocky Duan
|
1a92cc5c3f
|
callback for models
|
2012-08-15 15:46:58 -07:00 |
|
Mike Chen
|
d56ac9a71b
|
added comment
|
2012-08-15 17:22:09 -04:00 |
|
Mike Chen
|
158e978a7e
|
added naive caching. not sure how to expire.
|
2012-08-15 17:15:08 -04:00 |
|
Mike Chen
|
2454c06b08
|
Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance
|
2012-08-15 16:14:17 -04:00 |
|
Rocky Duan
|
72c3ad2acc
|
updated doc
|
2012-08-15 12:50:30 -07:00 |
|
Rocky Duan
|
f7f6164351
|
slight styling adjustment
|
2012-08-15 11:36:14 -07:00 |
|
Rocky Duan
|
f5251249a6
|
updated documentation
|
2012-08-15 11:32:05 -07:00 |
|
Rocky Duan
|
7335c1529e
|
show all content in a course in the forum view
|
2012-08-15 11:21:31 -07:00 |
|
Mike Chen
|
b4621d0562
|
added QueryCountDebugMiddleware
|
2012-08-15 11:21:11 -04:00 |
|
Mike Chen
|
7c22a39aca
|
Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance
Conflicts:
common/lib/xmodule/xmodule/discussion_module.py
lms/djangoapps/django_comment_client/forum/views.py
lms/templates/discussion/_thread.html
lms/urls.py
|
2012-08-15 11:05:20 -04:00 |
|
Rocky Duan
|
00ff1b9419
|
can retrieve all comments
|
2012-08-15 01:08:42 -07:00 |
|
Rocky Duan
|
e5fe54ca5d
|
display active threads with only relevant contents
|
2012-08-15 00:46:28 -07:00 |
|
Rocky Duan
|
9ef1a11c28
|
fixed merge bug
|
2012-08-14 18:12:35 -07:00 |
|
Rocky Duan
|
449d665b00
|
Merge branch 'master' of github.com:MITx/mitx into merge
|
2012-08-14 17:48:08 -07:00 |
|
Rocky Duan
|
308772500e
|
fixed permalink
|
2012-08-14 17:45:09 -07:00 |
|
Rocky Duan
|
b68a69cd7b
|
Merge branch 'brittany' of github.com:dementrock/mitx into merge
|
2012-08-14 17:37:29 -07:00 |
|
Rocky Duan
|
ea07d0697e
|
fixed openclose thread
|
2012-08-14 17:37:19 -07:00 |
|
Brittany Cheng
|
b9875b80e0
|
edit panel styles
|
2012-08-14 17:36:27 -07:00 |
|
Rocky Duan
|
5009b78150
|
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge
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
|
2012-08-14 17:32:30 -07:00 |
|
Brittany Cheng
|
46f2407e39
|
style fixes
|
2012-08-14 17:29:58 -07:00 |
|
Brittany Cheng
|
f20659f525
|
style fixes
|
2012-08-14 17:23:40 -07:00 |
|
Rocky Duan
|
00775a05a7
|
Merge branch 'brittany' of github.com:dementrock/mitx into profile
|
2012-08-14 17:18:35 -07:00 |
|
Brittany Cheng
|
6d24972678
|
similar post and search highlight
|
2012-08-14 17:18:07 -07:00 |
|
Rocky Duan
|
a701e703fd
|
Merge branch 'brittany' of github.com:dementrock/mitx into profile
|
2012-08-14 17:16:48 -07:00 |
|
Brittany Cheng
|
623b82eeff
|
similar post and search highlight
|
2012-08-14 17:16:22 -07:00 |
|
Rocky Duan
|
d0a339bec6
|
fixed similar posts suggestion
|
2012-08-14 17:13:27 -07:00 |
|
Brittany Cheng
|
8d492bbd6c
|
Merge branch 'profile' of github.com:dementrock/mitx into brittany
|
2012-08-14 17:00:29 -07:00 |
|
Rocky Duan
|
dd80cbc423
|
confirm before changing moderator status
|
2012-08-14 16:57:20 -07:00 |
|
Rocky Duan
|
700594263e
|
Merge branch 'brittany' of github.com:dementrock/mitx into profile &
small fix
Conflicts:
lms/templates/discussion/user_profile.html
|
2012-08-14 16:52:43 -07:00 |
|
Rocky Duan
|
457b7f468f
|
toggle moderator status
|
2012-08-14 16:43:33 -07:00 |
|
Brittany Cheng
|
f457381b95
|
Merge branch 'profile' of github.com:dementrock/mitx into brittany
|
2012-08-14 16:41:37 -07:00 |
|
Rocky Duan
|
97f1e2f5e4
|
removed debug line
|
2012-08-14 16:39:22 -07:00 |
|
Brittany Cheng
|
f983867e6b
|
moderator styles
|
2012-08-14 16:28:45 -07:00 |
|
Rocky Duan
|
eef24a5ebe
|
added administrator role
|
2012-08-14 15:58:04 -07:00 |
|
Rocky Duan
|
529c323771
|
fixed bug caused by missing course_id in retrieved comments
|
2012-08-14 15:57:02 -07:00 |
|
Rocky Duan
|
d4f024ed26
|
small bug fix
|
2012-08-14 15:06:54 -07:00 |
|
Rocky Duan
|
50e95de9ef
|
a place to start for the user profiel & fixed some bugs
|
2012-08-14 15:04:36 -07:00 |
|
Rocky Duan
|
04387289fa
|
fixed bugs caused by merging
|
2012-08-14 13:43:04 -07:00 |
|
Calen Pennington
|
49d3674601
|
Merge pull request #409 from MITx/feature/tomg/fall-design
started gradebook design; moved a few nav classes
|
2012-08-14 13:15:14 -07:00 |
|
Tom Giannattasio
|
a58a047582
|
moved global nav class
|
2012-08-14 16:12:36 -04:00 |
|
Tom Giannattasio
|
5aefda8d51
|
modified zebra stripes
|
2012-08-14 16:09:32 -04:00 |
|
Tom Giannattasio
|
dd92f51f02
|
added fluid widths
|
2012-08-14 16:09:32 -04:00 |
|
Tom Giannattasio
|
d673895eaa
|
added drag functionality
|
2012-08-14 16:09:32 -04:00 |
|
Tom Giannattasio
|
defa5b3159
|
basic gradebook template built; basic scroll functionality built
|
2012-08-14 16:09:32 -04:00 |
|
Tom Giannattasio
|
9871050f94
|
started gradebook
|
2012-08-14 16:09:32 -04:00 |
|
Calen Pennington
|
3ec0876618
|
Merge pull request #410 from MITx/feature/cale/queue_config
Feature/cale/queue config
|
2012-08-14 12:57:18 -07:00 |
|
Calen Pennington
|
9c0e41691c
|
Make XQueueInterface a new-style class
|
2012-08-14 15:57:07 -04:00 |
|
Rocky Duan
|
eb47093b1c
|
Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
common/djangoapps/student/models.py
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
|
2012-08-14 12:54:43 -07:00 |
|