Your Name
|
6fb8adaa50
|
add flagging and unflagging tests to response show view
|
2013-05-17 09:52:02 -04:00 |
|
Your Name
|
ad5b71deae
|
format content view test for readability
|
2013-05-17 09:34:41 -04:00 |
|
Your Name
|
296a878169
|
add flagging tests to DiscussionContentView
|
2013-05-17 09:31:12 -04:00 |
|
Your Name
|
ce2308b5bb
|
add flagging tests to DiscussionContentView
|
2013-05-17 09:28:12 -04:00 |
|
Your Name
|
82d2b78b96
|
update jasmine tests
|
2013-05-16 10:56:58 -04:00 |
|
Your Name
|
90892450b7
|
failed jasmine tests still failing
|
2013-05-16 10:56:57 -04:00 |
|
Jay Zoldak
|
cc2cc469fe
|
more work on jasmine tests for forums
|
2013-05-16 10:56:57 -04:00 |
|
Jay Zoldak
|
cbdf93473b
|
start to get the jasmine tests working for comment service
|
2013-05-16 10:56:57 -04:00 |
|
Jay Zoldak
|
ed3df10638
|
Set up rake task for jasmine tests for discussion forums code.
|
2013-05-16 10:56:57 -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 |
|
Your Name
|
4b806768ec
|
more server trial and error
|
2013-05-16 10:29:33 -04:00 |
|
Your Name
|
8568ce7ad0
|
server django version generating 1 instead of True so test for both
|
2013-05-16 10:29:33 -04:00 |
|
Kevin Chugh
|
ab08fa94e4
|
coffeescript fixes
|
2013-05-16 10:29:32 -04:00 |
|
Jay Zoldak
|
aa4e29d2f1
|
Add leanModal vendor src to files.json for cms jasmine tests. Also .gitignore compiled js from coffee specs
|
2013-04-30 15:22:08 -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
|
b8114b9eb2
|
restore accidentally deleted chunk
|
2013-04-22 16:17:54 -04:00 |
|
Your Name
|
8a02001a4f
|
minimize diff by restoring function locations
|
2013-04-22 15:40:19 -04:00 |
|
Your Name
|
385026172e
|
remove double Comment from merge conflict
|
2013-04-22 15:28:27 -04:00 |
|
Kevin Chugh
|
bb12cdf6f4
|
remove whitespace
|
2013-04-21 19:57:19 -04:00 |
|
Kevin Chugh
|
bee25f3ba0
|
fix git mangle take 3
|
2013-04-21 19:51:04 -04:00 |
|
Kevin Chugh
|
9d57f0a9d2
|
fix git mangle take 2
|
2013-04-21 19:47:27 -04:00 |
|
Kevin Chugh
|
649578ea2f
|
unify flag moderator permissions
|
2013-04-21 06:15:23 -04:00 |
|
Kevin Chugh
|
93978da87c
|
fixes cleanup
|
2013-04-09 14:57:43 -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
|
daa0cd22d5
|
filter implemented for flagged
|
2013-04-01 23:16:22 -04:00 |
|
Kevin Chugh
|
5534d8bdce
|
fix mega merge conflicts
|
2013-03-29 07:33:52 -04:00 |
|
Your Name
|
a761e2e829
|
make pinning backward compatible
|
2013-03-15 12:38:28 -04:00 |
|
Your Name
|
7f877344d6
|
added comment to explain sorting
|
2013-03-13 19:47:19 -04:00 |
|
Your Name
|
896ee094c6
|
added comment to explain sorting
|
2013-03-13 19:44:41 -04:00 |
|
Your Name
|
117be695cb
|
candidate without inline
|
2013-03-13 18:40:10 -04:00 |
|
Your Name
|
08bc073fa5
|
updates
|
2013-03-13 16:40:04 -04:00 |
|
Your Name
|
a2f9e4d565
|
almost there
|
2013-03-13 15:29:57 -04:00 |
|
Your Name
|
7450128064
|
update coffeescript
|
2013-03-13 12:52:07 -04:00 |
|
Your Name
|
8280c55992
|
pinning .1
|
2013-03-12 17:40:26 -04:00 |
|
Victor Shnayder
|
fb350ed1e3
|
Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule
Feature/abarrett/annotatable xmodule DO NOT MERGE
|
2013-03-06 12:05:27 -08:00 |
|
Your Name
|
b7a6eadca4
|
new cohorts tested
|
2013-03-01 16:33:27 -05:00 |
|
Arthur Barrett
|
afa7fca15a
|
Merge branch 'master' into feature/abarrett/annotatable_xmodule
|
2013-02-27 11:58:38 -05:00 |
|
Your Name
|
ff68853990
|
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
|
2013-02-21 13:30:24 -05:00 |
|
Arthur Barrett
|
72d9c1d7d2
|
Saving work-in-progress of guided classification exercise.
|
2013-02-18 19:02:54 -05:00 |
|
Kevin Chugh
|
21f4616080
|
spread less than and greater than fix to responses and comments, and profile view
|
2013-02-12 09:18:46 -05:00 |
|
Kevin Chugh
|
d57c78f9d9
|
fix showing less than and greater than in code
|
2013-02-11 20:01:09 -05:00 |
|
Your Name
|
f500806247
|
make hide/show synchronous for cohort filters
|
2013-02-08 18:18:12 -05:00 |
|
Your Name
|
cc0a6a2da9
|
make hide/show synchronous for cohort filters
|
2013-02-08 18:03:27 -05:00 |
|
Your Name
|
7761f6cb04
|
make cohort filter visibility conditional on selected commentable cohortedness
|
2013-02-08 17:22:29 -05:00 |
|
Your Name
|
21c06c741b
|
inline mustache working
|
2013-02-08 14:28:48 -05:00 |
|
Kevin Chugh
|
3cfc5c4545
|
cohort filter wokorking
|
2013-02-07 19:18:21 -05:00 |
|
Your Name
|
3965f9129d
|
cohort filter almost done
|
2013-02-07 18:13:53 -05:00 |
|
Kevin Chugh
|
d047d826c7
|
update coffeescript to hide cohort choice if first commmentable is not cohorted
|
2013-02-06 22:00:03 -05:00 |
|