399 Commits

Author	SHA1	Message	Date
Riley Davis	7bfd9e2e71	remove lodash implementation	2016-12-09 14:48:29 -10:00
Riley Davis	74c4d812cd	less changes	2016-12-09 14:39:16 -10:00
Riley Davis	7186c2b060	have moderation queue use proper mapStateToProps	2016-12-09 14:38:29 -10:00
Riley Davis	b05f4cfb16	remove logs	2016-12-09 14:25:24 -10:00
Riley Davis	7732aa4abe	typo	2016-12-09 14:20:46 -10:00
Riley Davis	a80dd953c8	update ModerationQueue and CommentStream to not use immutable.js deep in the stack	2016-12-09 14:13:48 -10:00
Riley Davis	1c2ef760ef	remove cruft by pulling out some immutable.js stuff	2016-12-09 11:46:04 -10:00
Gabriela Rodríguez Berón	f29c0a3a09	Merge branch 'master' into ban-user	2016-12-09 10:43:55 -10:00
Gabriela Rodríguez Berón	ba169147e7	Merge branch 'master' into ban-user	2016-12-09 10:28:32 -10:00
Gabriela Rodríguez Berón	1fefd3c8b4	Merge branch 'master' into wordlist	2016-12-09 10:26:39 -10:00
Riley Davis	44ae886af7	put some space between buttons on the banuserdialog	2016-12-09 10:08:55 -10:00
gaba	8b850a8d33	Fix the message.	2016-12-09 09:29:27 -10:00
gaba	d9b778fa74	A few translations for the spanish for this feature.	2016-12-09 09:19:08 -10:00
gaba	01dc4e4144	fix merge.	2016-12-09 08:30:30 -10:00
gaba	15557c16e2	Merge branch 'master' into ban-user	2016-12-09 08:28:46 -10:00
David Jay	bfe188eb5c	Cleaning up from merge.	2016-12-09 13:17:50 -05:00
David Jay	e032a5521e	Merge branch 'master' of github.com:coralproject/talk into wordlist	2016-12-09 13:05:11 -05:00
Belen Curcio	3ef8f295c3	newConfig update	2016-12-09 12:59:17 -03:00
Belen Curcio	b33713e723	Changes to master	2016-12-09 12:32:59 -03:00
Belen Curcio	e4df3bcafc	Merge branch 'master' of github.com:coralproject/talk into asset-comment-settings	2016-12-09 12:28:40 -03:00
Dan Zajdband	09ba535d68	Merge with master	2016-12-09 10:17:55 -05:00
gaba	71d6b90993	SMall changes for PR.	2016-12-08 18:29:15 -10:00
gaba	ecd3f5c347	IT removes duplicated code.	2016-12-08 18:19:00 -10:00
gaba	a46ffe8ea6	It removes duplicated code.	2016-12-08 18:16:37 -10:00
gaba	9bfac3872e	Moves banUser to users actions instead of comments actions.	2016-12-08 18:16:17 -10:00
gaba	0df1b9a498	Remove file that is not being used anymore.	2016-12-08 16:37:05 -10:00
gaba	1eb204f822	Merge branch 'master' into ban-user	2016-12-08 13:28:12 -10:00
Riley Davis	4572d8e68e	filter by premod status	2016-12-08 12:20:54 -10:00
Dan Zajdband	fed41e1fba	Linted code	2016-12-08 16:59:29 -05:00
gaba	953178a1e4	Adds a translation string in spanish.	2016-12-08 10:27:24 -10:00
Belen Curcio	acbd465636	merge	2016-12-08 16:37:11 -03:00
Belen Curcio	59182e75d3	Translations	2016-12-08 16:32:39 -03:00
gaba	50afa3d190	Merge branch 'master' into ban-user	2016-12-08 09:22:22 -10:00
Belen Curcio	74e4771e17	new config	2016-12-08 16:21:07 -03:00
Riley Davis	be2d9838e6	Merge branch 'master' into wordlist	2016-12-08 09:13:48 -10:00
Belén Curcio	0c050bdec9	Merge branch 'master' into like-login-prompt	2016-12-08 15:53:16 -03:00
David Jay	e91564f706	Merge branch 'master' of github.com:coralproject/talk into like-login-prompt	2016-12-08 13:49:15 -05:00
David Jay	9b5d85aaef	Merge branch 'wordlist' of github.com:coralproject/talk into wordlist	2016-12-08 13:26:02 -05:00
David Jay	6d701ef49e	Updating to detect new status format.	2016-12-08 13:25:18 -05:00
David Jay	8446c49c14	Fixing error when posting comment.	2016-12-08 13:08:18 -05:00
Dan Zajdband	fb392422ea	Added textarea for closed message on admin	2016-12-08 12:44:02 -05:00
gaba	ec2b40fafe	Missed a few actions when banned.	2016-12-07 16:49:55 -10:00
gaba	23c67b4a49	It fix the status change after merging master in.	2016-12-07 16:37:11 -10:00
Riley Davis	6247510cd7	Merge branch 'master' into wordlist	2016-12-07 16:15:23 -10:00
gaba	0e2a7decd4	Adds ban/unban to cli. Fix ban user in the admin.	2016-12-07 14:55:49 -10:00
Riley Davis	e56583e250	Merge branch 'master' into bugfix-for-permalink-path	2016-12-07 09:11:22 -10:00
Riley Davis	260d1bd9f4	restoring the scroll to comment functionality	2016-12-06 16:29:40 -10:00
Riley Davis	d9d9c50961	un-sneaking in some stuff	2016-12-06 15:52:22 -10:00
Riley Davis	1201196566	un-sneaking in some stuff	2016-12-06 15:51:22 -10:00
Riley Davis	09245403aa	riley is silly	2016-12-06 14:42:09 -10:00