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 |
|
Bridger Maxwell
|
9f770ef921
|
Visiting the wiki from a course you aren't in does a redirect to the regular wiki.
|
2012-08-14 19:16:45 -04: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 |
|
Bridger Maxwell
|
ceaa6a4ff2
|
You can now click around in the wiki without losing your course nav bar.
|
2012-08-14 18:44:23 -04:00 |
|
kimth
|
75eee443ff
|
Xqueue callback acquires lock on StudentModule to avoid race condition
|
2012-08-14 18:13:53 -04: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 |
|
Bridger Maxwell
|
85f1899cb6
|
Wiki pages can now be viewed from the course URL and the course nav is shown. It doesn't follow the user yet.
|
2012-08-14 17:15:44 -04: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 |
|
Calen Pennington
|
d7fc2d6654
|
Merge pull request #408 from MITx/feature/fix_askbot_urls
Fix askbot URLs in the theme
|
2012-08-14 12:54:17 -07:00 |
|
Rocky Duan
|
3c32aff123
|
disable asc sorting for now
|
2012-08-14 12:50:22 -07:00 |
|
Rocky Duan
|
0992be3749
|
make top sort by last_activity_at for now
|
2012-08-14 12:45:22 -07:00 |
|
Rocky Duan
|
49e840d62b
|
adjust new post button in forum view
|
2012-08-14 12:43:15 -07:00 |
|
David Ormsbee
|
3c9f099026
|
Modify server group dev config to enable separate concurrent Askbot instances.
|
2012-08-14 14:31:39 -04:00 |
|
Bridger Maxwell
|
1f43ae6d3e
|
Renamed namespace to wiki_slug in course_module.py.
|
2012-08-14 13:49:53 -04:00 |
|
Rocky Duan
|
28f0dd2759
|
make delete actually working again
|
2012-08-14 10:24:41 -07:00 |
|
Rocky Duan
|
60b2423c91
|
prompt window for deleting
|
2012-08-14 10:21:11 -07:00 |
|
Calen Pennington
|
814f55aad0
|
Fix the name of HTTPBasicAuth
|
2012-08-14 12:45:34 -04:00 |
|
Calen Pennington
|
6e88777126
|
Import HttpBasicAuth from the right place
|
2012-08-14 12:34:25 -04:00 |
|
Calen Pennington
|
8ce12b10b2
|
Pass HttpBasicAuth object to requests, rather than a list, which it didn't understand
|
2012-08-14 12:32:52 -04:00 |
|
David Ormsbee
|
e85db61407
|
Fix simple navigation and JS includes on askbot
|
2012-08-14 12:21:20 -04:00 |
|
David Ormsbee
|
9687dc8397
|
Add social images to Askbot theme
|
2012-08-14 12:20:58 -04:00 |
|
Calen Pennington
|
c4bed2c128
|
Add basic authentication support for requests made to the xqueue server
|
2012-08-14 11:59:47 -04:00 |
|
Calen Pennington
|
43745dacca
|
Add queue interface for test purposes
|
2012-08-14 11:59:46 -04:00 |
|
Calen Pennington
|
f09aca917f
|
Fix name of XQueueInterface
|
2012-08-14 11:59:46 -04:00 |
|
Calen Pennington
|
09fc932a20
|
Add default XQUEUE_INTERFACE to the dev environment
|
2012-08-14 11:59:46 -04:00 |
|
Calen Pennington
|
91b6bb649c
|
Move queue interface url and auth into configuration, rather than hardcoding it
|
2012-08-14 11:59:46 -04:00 |
|
David Ormsbee
|
137d4856cc
|
We're loading static assets from the askbot theme directory in the lms proj now.
|
2012-08-14 11:54:02 -04:00 |
|
Calen Pennington
|
cfe712cb2a
|
Merge pull request #407 from MITx/kimth/generic-coderesponse
Kimth/generic coderesponse
|
2012-08-14 08:48:50 -07:00 |
|
Bridger Maxwell
|
3dce1c2884
|
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
|
2012-08-14 11:40:00 -04:00 |
|
Bridger Maxwell
|
eeeb677354
|
Fixed wiki urls bug. Fixed reverse for course wiki.
|
2012-08-14 11:39:49 -04:00 |
|
Bridger Maxwell
|
dd56fd0916
|
Added some comments for the mitxmako additions.
|
2012-08-14 09:13:42 -04:00 |
|