Tom Giannattasio
|
13c2bb588e
|
added styles for main article, sidebar and breadcrumb
|
2012-08-15 15:59:46 -04:00 |
|
Rocky Duan
|
f7f6164351
|
slight styling adjustment
|
2012-08-15 11:36:14 -07:00 |
|
Kyle Fiedler
|
6d7225bebb
|
Added some final touches to askbot
|
2012-08-15 13:51:10 -04:00 |
|
Kyle Fiedler
|
ff1f090737
|
Added more fixes for askbot also fixed some of the extra padding
|
2012-08-15 13:51:10 -04:00 |
|
Kyle Fiedler
|
0804ff7a75
|
Added styles for single question and profile view
|
2012-08-15 13:51:10 -04:00 |
|
Kyle Fiedler
|
bbe9432508
|
Lots of askbot fixes
|
2012-08-15 13:51:10 -04:00 |
|
Tom Giannattasio
|
8daea9c465
|
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
|
2012-08-15 13:11:00 -04:00 |
|
Tom Giannattasio
|
abf26dced9
|
started styles
|
2012-08-15 13:10:47 -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
|
b68a69cd7b
|
Merge branch 'brittany' of github.com:dementrock/mitx into merge
|
2012-08-14 17:37:29 -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 |
|
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
|
f983867e6b
|
moderator styles
|
2012-08-14 16:28:45 -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 |
|
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 |
|
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 |
|
Rocky Duan
|
3c32aff123
|
disable asc sorting for now
|
2012-08-14 12:50:22 -07:00 |
|
Rocky Duan
|
49e840d62b
|
adjust new post button in forum view
|
2012-08-14 12:43:15 -07:00 |
|
Rocky Duan
|
60b2423c91
|
prompt window for deleting
|
2012-08-14 10:21:11 -07:00 |
|
Rocky Duan
|
38bdcabe53
|
reply now works again
|
2012-08-13 23:23:13 -07:00 |
|
Rocky Duan
|
19ba57858c
|
fixed focus bug: mistakenly binded event twice
|
2012-08-13 22:55:08 -07:00 |
|
Rocky Duan
|
6fa0298546
|
make retrieved single thread/comment after update integrated with permissions
|
2012-08-13 21:42:28 -07:00 |
|
Rocky Duan
|
0fa0f2c8ae
|
add cancel button for new post
|
2012-08-13 21:15:04 -07:00 |
|
Calen Pennington
|
a7b88550c7
|
Merge pull request #401 from MITx/feature/kfiedler/courseware-style
Added tooltip styles, made all buttons the same, and other small changes...
|
2012-08-13 12:29:48 -07:00 |
|
Kyle Fiedler
|
731f1cd7a8
|
Added tooltip styles, made all buttons the same, and other small changes throughout the courseware
|
2012-08-13 15:05:43 -04:00 |
|
Tom Giannattasio
|
ee0cbf66f9
|
added a cleaner arrow implementation
|
2012-08-13 10:19:06 -04:00 |
|
Rocky Duan
|
12897ffff0
|
added title & tag for new post & fixed error handling; reply button in generated thread doesn't work
|
2012-08-12 22:54:02 -07:00 |
|
Rocky Duan
|
44f7b37bfb
|
refactored comment_client working
|
2012-08-12 12:56:55 -07:00 |
|
Rocky Duan
|
7030d1f1a2
|
fixed endorse&edit&delete
|
2012-08-11 14:38:37 -07:00 |
|
Rocky Duan
|
2f469f0f29
|
Merge branch 'brittany' of github.com:dementrock/mitx into mergedtom
|
2012-08-10 18:51:18 -07:00 |
|