Commit Graph

28 Commits

Author SHA1 Message Date
Your Name
6276997180 update checkbox with get settings 2013-07-29 13:26:31 -04:00
Kevin Chugh
d95693ebb7 hook up panel to new stats service 2013-07-25 03:23:04 -04:00
Jay Zoldak
ed5ad46192 Revert "Revert "fix merge conflict""
This reverts commit 2df3fe9344.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee
2013-05-16 10:29:33 -04:00
David Baumgold
b344976fe7 Making linters happier 2013-05-03 15:08:28 -04:00
Diana Huang
2df3fe9344 Revert "fix merge conflict"
This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
2013-04-26 12:40:35 -04:00
Your Name
30104979e7 fix downvoting url 2013-04-22 16:25:16 -04:00
Your Name
af1c411ddf gentler url diff 2013-04-22 16:23:21 -04:00
Kevin Chugh
5534d8bdce fix mega merge conflicts 2013-03-29 07:33:52 -04:00
Your Name
8280c55992 pinning .1 2013-03-12 17:40:26 -04:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Kevin Chugh
def2d8adf2 fix cohorts in create, and read, and update regular expressions to fix courses with periods not working in General commentable 2013-01-24 14:20:18 -05:00
Kevin Chugh
deb3888a84 thread response flagging 2012-12-06 14:13:54 -05:00
Kevin Chugh
70b0b5beb8 update models 2012-12-06 10:43:51 -05:00
Kevin Chugh
50db11a647 urls and views for comment flagging 2012-12-05 17:08:29 -05:00
Kevin Chugh
4dee832f35 convert flagging to one flag 2012-12-02 13:04:27 -05:00
Your Name
4b017e711d updated models and vies f for flagging 2012-11-20 17:00:16 -05:00
Your Name
57b70092e8 update front end to handle flagging 2012-11-20 13:39:33 -05:00
Rocky Duan
457b7f468f toggle moderator status 2012-08-14 16:43:33 -07:00
Rocky Duan
547114a823 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-07 11:31:26 -04:00
Rocky Duan
0c311b8f13 search for similar posts without any styling.. 2012-08-07 11:22:41 -04:00
Mike Chen
3f1534eab7 added permission framework. 2012-08-06 12:58:20 -04:00
Rocky Duan
600beb2849 ajax vote / unvote comments 2012-08-03 14:52:39 -04:00
Rocky Duan
5ba879fc13 refactored some code 2012-08-02 18:23:50 -04:00
Rocky Duan
8e3251c915 basic tag autocomplete 2012-07-29 17:32:00 -04:00
Rocky Duan
b92a180d25 add tags to threads & view threads by tags 2012-07-29 15:24:15 -04:00
Rocky Duan
0790a3add4 image uploading & render markdown 2012-07-27 17:50:38 -04:00
Rocky Duan
a06cc229a0 watch/unwatch threads; display current vote 2012-07-24 15:34:17 -04:00
Rocky Duan
fdab215eb4 moved django_comment_client into edx 2012-07-23 16:20:45 -04:00