529 Commits

Author	SHA1	Message	Date
David Jay	889f29739c	Merge branch 'master' into add-flag-option	2016-12-20 11:22:38 -08:00
David Jay	3b17ae5313	Merge branch 'master' into add-flag-option	2016-12-19 12:37:24 -05:00
Belen Curcio	2d9ee1d9d7	Moderaion Queue updated to master	2016-12-19 13:34:42 -03:00
Belen Curcio	9950595245	Commenter likes a comment	2016-12-18 19:34:41 -03:00
Belen Curcio	f52a1668b0	Test logouts and approves after commenting	2016-12-18 19:07:31 -03:00
Belen Curcio	428a62ffd4	tests	2016-12-18 11:31:27 -03:00
Belen Curcio	927a3fcd83	Updating package.json and nightwatch package	2016-12-17 10:50:47 -03:00
gaba	ee6c4bb831	Merge branch 'master' into issue-186	2016-12-16 17:55:21 -08:00
Gabriela Rodríguez Berón	fcb3eeca9e	Merge branch 'master' into add-flag-option	2016-12-16 17:53:22 -08:00
Gabriela Rodríguez Berón	4f0c0d2e42	Merge branch 'master' into fix-config-warnings	2016-12-16 17:44:21 -08:00
Gabriela Rodríguez Berón	0e0aafeb1c	Merge branch 'master' into add-flag-option	2016-12-16 17:44:03 -08:00
gaba	3266934fc8	It needed to have the Moderation Modal inside a tab container too.	2016-12-16 17:39:22 -08:00
Wyatt Johnson	7f12741c13	added comments to linter	2016-12-16 16:46:15 -07:00
David Jay	5973560043	Updating translation.	2016-12-16 18:20:31 -05:00
David Jay	871836f636	Adding description field to flags.	2016-12-16 18:19:05 -05:00
Riley Davis	13994686e4	fix some config warnings	2016-12-16 15:20:02 -07:00
Dan Zajdband	ad084847e5	Lint	2016-12-16 16:35:39 -05:00
Dan Zajdband	6ddece4717	Fixed closing at	2016-12-16 16:16:48 -05:00
Riley Davis	5d96ff9d63	Merge branch 'master' into my-comments-designs	2016-12-16 12:29:38 -07:00
Riley Davis	647d62969d	design tweaks per kim	2016-12-16 12:24:32 -07:00
Dan Zajdband	decdfad39b	Adding show shortcuts button and minor fixes (#177) ... * Adding show shortcuts button and minor fixes * Lint * Unwrapping the showComments method	2016-12-16 12:32:09 -05:00
Dan Zajdband	9e9291ba64	Lint	2016-12-16 12:07:54 -05:00
Dan Zajdband	8631c3bd9b	Adding show shortcuts button and minor fixes	2016-12-16 12:03:37 -05:00
riley	c7d4bb6961	add a newline so lint doesn't complain	2016-12-15 15:20:50 -07:00
riley	632956e084	failed to update tests. working now	2016-12-15 15:20:02 -07:00
Gabriela Rodríguez Berón	70ef071464	Merge branch 'master' into fix-embed-pathing	2016-12-15 13:50:41 -08:00
Riley Davis	181e558b28	comments not showing on embed page	2016-12-15 14:36:14 -07:00
Riley Davis	203d35e6d1	link to comment instead of article	2016-12-15 14:33:33 -07:00
Riley Davis	6f0de84144	fix lint	2016-12-15 14:03:54 -07:00
Gabriela Rodríguez Berón	5ffc575fae	Merge branch 'master' into my-comments-fix	2016-12-15 12:52:26 -08:00
Dan Zajdband	fcb107aefe	Global comment stream close setting (#171) ... * Added basic ui * Added functionality * Linted code * using named params instead of props * lint * fixed missing merge	2016-12-15 15:50:19 -05:00
Riley Davis	1ea284d428	remove fromJS call	2016-12-15 13:43:06 -07:00
Riley Davis	f4ee28c618	allow non-admin folks to list their comments	2016-12-15 13:05:59 -07:00
Riley Davis	d599a65c05	file not being used anywhere	2016-12-15 10:44:20 -07:00
Riley Davis	29b6fc08cd	hydrate the assets in the comment response	2016-12-14 14:41:54 -07:00
Riley Davis	601010f1f9	update constant names	2016-12-14 13:58:28 -07:00
Riley Davis	a6fdd2e46b	remove redundant endpoint	2016-12-14 13:53:07 -07:00
Riley Davis	eac53a58b4	add jsdom. tests pass	2016-12-14 13:22:01 -07:00
Riley Davis	624eaeee11	move tests to tests directory	2016-12-14 12:01:32 -07:00
Riley Davis	5962037c21	display list of comments with asset url	2016-12-13 16:03:50 -07:00
Riley Davis	243bd50894	Merged branch master into my-comments	2016-12-13 15:01:34 -07:00
riley	2be60b3208	Merged master into my-comments	2016-12-13 14:33:17 -07:00
David Jay	f17564ec36	Merge branch 'master' into view-char-count	2016-12-13 15:34:58 -05:00
Riley Davis	52771fc82c	pluralize asset endpoints	2016-12-13 12:45:58 -07:00
Riley Davis	37d8c3ad38	try to request a list of assets and fail	2016-12-13 12:40:06 -07:00
Riley Davis	454357fa55	Merge branch 'master' into view-char-count	2016-12-13 12:09:52 -07:00
David Jay	9c7eeb1ec5	Merge branch 'master' into use-js-while-rendering	2016-12-13 14:06:37 -05:00
David Jay	72226f6fe8	Merge branch 'master' into asset-status	2016-12-13 14:00:58 -05:00
gaba	387e20309a	We already have the default for closedMessage to be null in the model. Removing the passing of a blank closedMEssage.	2016-12-13 10:42:30 -08:00
David Jay	113ceb9889	Merge branch 'master' into view-char-count	2016-12-13 13:28:06 -05:00