Rocky Duan
|
322828fbff
|
removed unnecessary template
|
2012-08-12 16:41:16 -07:00 |
|
Rocky Duan
|
44f7b37bfb
|
refactored comment_client working
|
2012-08-12 12:56:55 -07:00 |
|
Rocky Duan
|
b7d3361894
|
Merge branch 'mergedtom' into refactor
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
|
2012-08-11 17:43:16 -07:00 |
|
Rocky Duan
|
de8c828fb3
|
changed comment_client module to be imported as cc
|
2012-08-11 17:42:08 -07:00 |
|
Rocky Duan
|
2848c1fe38
|
switched to refactored comment_client
|
2012-08-11 17:36:58 -07:00 |
|
Rocky Duan
|
2d256dfe1d
|
attempt to fix sort
|
2012-08-11 16:35:34 -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 |
|
Rocky Duan
|
39590116f7
|
make some indentation
|
2012-08-10 18:51:12 -07:00 |
|
Brittany Cheng
|
78ca885b05
|
fix comment styles
|
2012-08-10 18:42:07 -07:00 |
|
Rocky Duan
|
66beb54739
|
Merge branch 'brittany' of github.com:dementrock/mitx into lol
|
2012-08-10 17:59:28 -07:00 |
|
Rocky Duan
|
ab6cf914a0
|
Merge branch 'brittany' of github.com:dementrock/mitx into lol
Conflicts:
lms/templates/discussion/_thread.html
|
2012-08-10 17:59:19 -07:00 |
|
Brittany Cheng
|
5b6e3997af
|
fixed ul courseware
|
2012-08-10 17:58:18 -07:00 |
|
Rocky Duan
|
86b53bb248
|
uh
|
2012-08-10 17:53:22 -07:00 |
|
Brittany Cheng
|
f44358ab78
|
merge tom's styles
|
2012-08-10 17:52:07 -07:00 |
|
Tom Giannattasio
|
5c14a1ce65
|
added admin controls to main post and comments
|
2012-08-08 16:42:19 -04:00 |
|
Rocky Duan
|
65f849637f
|
Merge branch 'ccp0101/moderation' into lol
Conflicts:
lms/urls.py
|
2012-08-08 14:39:10 -04:00 |
|
Rocky Duan
|
c453885489
|
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
|
2012-08-08 14:36:31 -04:00 |
|
Tom Giannattasio
|
9b9bb22cda
|
tightened white space; fixed double margin in comments
|
2012-08-08 14:36:19 -04:00 |
|
Brittany Cheng
|
3ec658df56
|
merge tom's styles, warning: LOTS OF STUFF BROKE
|
2012-08-08 12:45:40 -04:00 |
|
Mike Chen
|
2b803b024e
|
fix MITx master bug in courseware.
|
2012-08-08 12:02:50 -04:00 |
|
Mike Chen
|
5e6261ebb1
|
courseware still not working..
|
2012-08-08 11:30:11 -04:00 |
|
Mike Chen
|
8627a5f33e
|
Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation
|
2012-08-08 11:20:13 -04:00 |
|
Tom Giannattasio
|
dc5b8b51c4
|
placeholder and button color updates
|
2012-08-08 11:08:58 -04:00 |
|
Calen Pennington
|
80b8529f2f
|
Merge branch 'hotfix/1.0.4'
Conflicts:
common/djangoapps/util/middleware.py
|
2012-08-08 11:05:26 -04:00 |
|
Tom Giannattasio
|
10ff6af3bb
|
discussion sidebar additions; inline text editor example
|
2012-08-08 10:56:59 -04:00 |
|
Rocky Duan
|
2e45b8c3c6
|
Merge branch 'ccp0101/moderation' into lol
|
2012-08-08 10:46:11 -04:00 |
|
Rocky Duan
|
b1e1cd57d8
|
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
|
2012-08-08 10:45:04 -04:00 |
|
Rocky Duan
|
18fcdc4be2
|
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
|
2012-08-08 10:44:24 -04:00 |
|
Mike Chen
|
b2a048e6fc
|
limit permissions of a role to courses and fix bugs
|
2012-08-08 10:42:29 -04:00 |
|
Rocky Duan
|
c2f27a5f8e
|
some starting refactor ideas
|
2012-08-08 10:03:49 -04:00 |
|
Calen Pennington
|
ebd0458d6d
|
Merge pull request #363 from MITx/feature/ichuang/improved-staff-debug-jquery
improve staff_problem_info jquery, so the histogram is also toggled
|
2012-08-08 05:57:51 -07:00 |
|
Rocky Duan
|
f1dabe1575
|
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into lol
|
2012-08-07 18:55:34 -04:00 |
|
Rocky Duan
|
f3d44225cc
|
Merge branch 'brittany' of github.com:dementrock/mitx into brittany
|
2012-08-07 18:51:18 -04:00 |
|
Rocky Duan
|
690d97f28b
|
fixed merge bugs
|
2012-08-07 18:49:59 -04:00 |
|
Mike Chen
|
e9c970e399
|
revert permanent link for comments
|
2012-08-07 18:45:26 -04:00 |
|
ichuang
|
9241841195
|
improve staff_problem_info jquery, so the histogram is also toggled
|
2012-08-07 18:36:04 -04:00 |
|
Rocky Duan
|
2fb02f1a73
|
Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
lms/urls.py
|
2012-08-07 16:58:14 -04:00 |
|
Brittany Cheng
|
1f1ea8ad5e
|
left nav styles
|
2012-08-07 16:56:53 -04:00 |
|
Brittany Cheng
|
0fba4d9848
|
left nav styles
|
2012-08-07 16:54:13 -04:00 |
|
Brittany Cheng
|
67777ef5a2
|
left nav styles
|
2012-08-07 16:52:32 -04:00 |
|
Rocky Duan
|
272c7b8b0c
|
Merge branch 'master' into merge
|
2012-08-07 16:49:54 -04:00 |
|
Brittany Cheng
|
8df3ec3dae
|
Merge branch 'master' of github.com:dementrock/mitx into brittany
|
2012-08-07 16:42:45 -04:00 |
|
Rocky Duan
|
2685a3b637
|
trending tags
|
2012-08-07 16:41:01 -04:00 |
|
Brittany Cheng
|
a2f0e31d90
|
Merge branch 'master' of github.com:dementrock/mitx into brittany
|
2012-08-07 16:21:24 -04:00 |
|
Brittany Cheng
|
9ae21a878a
|
recent activity
|
2012-08-07 16:21:19 -04:00 |
|
Rocky Duan
|
fddee7defa
|
Merge branch 'brittany' of github.com:dementrock/mitx
Conflicts:
lms/templates/discussion/_recent_active_posts.html
|
2012-08-07 16:19:10 -04:00 |
|
Brittany Cheng
|
d934142adf
|
Merge branch 'master' of github.com:dementrock/mitx into brittany
|
2012-08-07 16:16:32 -04:00 |
|
Rocky Duan
|
7ba3bdfd61
|
show recently active posts user's following
|
2012-08-07 16:16:23 -04:00 |
|
Rocky Duan
|
6023aca559
|
scaffold for trending tags
|
2012-08-07 16:15:43 -04:00 |
|