Commit Graph

23 Commits

Author SHA1 Message Date
Ned Batchelder
df4b512b6f Change wildcard imports into specific imports 2013-06-21 17:33:06 -04:00
Jay Zoldak
3b8a8a13b0 Revert "Revert "Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs""
This reverts commit 5560a4add4.
2013-05-16 10:29:33 -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
Diana Huang
2df3fe9344 Revert "fix merge conflict"
This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
2013-04-26 12:40:35 -04:00
Diana Huang
5560a4add4 Revert "Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs"
This reverts commit 57427f9ac5, reversing
changes made to 37621c26cd.
2013-04-26 12:40:02 -04:00
Your Name
67f57a7145 use new API verbs 2013-04-23 13:28:23 -04:00
Your Name
7994e1b344 pep8 fixes 2013-04-22 12:53:30 -04:00
Kevin Chugh
24095679a6 add back comment response flagging 2013-04-05 19:04:18 -04:00
Kevin Chugh
de7c511328 flagging working again 2013-04-05 16:39:22 -04:00
Kevin Chugh
0e8ef28347 flagging almost done 2013-04-05 13:23:09 -04:00
Kevin Chugh
5534d8bdce fix mega merge conflicts 2013-03-29 07:33:52 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Kevin Chugh
258b1fe9a5 thread responses create fixed 2012-12-06 22:12:17 -05:00
Kevin Chugh
deb3888a84 thread response flagging 2012-12-06 14:13:54 -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
fb6a07c812 allow flagging for abuse and spoilers 2012-11-16 18:39:54 -05:00
Arjun Singh
fff7bcc5a7 Remove more tags; anonymity to peers 2012-09-14 02:50:08 -07:00
Rocky Duan
3cbaba1961 fixed autosubscribe 2012-08-22 14:11:19 -07:00
Rocky Duan
a90af0c471 render permalink in backend 2012-08-21 23:26:06 -07:00
Rocky Duan
0dd5428e24 refactored code to render ajax content 2012-08-18 17:54:43 -07:00
Rocky Duan
38bdcabe53 reply now works again 2012-08-13 23:23:13 -07:00