438 Commits

Author	SHA1	Message	Date
David Jay	f58ede45d9	Merge branch 'master' into wordlist	2016-12-12 17:20:33 -05:00
Wyatt Johnson	f7b4aed620	Merge branch 'master' into wordlist	2016-12-12 15:58:40 -05:00
David Jay	409c9c3eb5	Merge branch 'master' into fix-signup-bug	2016-12-12 15:56:26 -05:00
David Jay	cb576dca8f	Updating signup endpoint to reflect current api.	2016-12-12 15:52:34 -05:00
David Jay	7b113c1931	Merge branch 'master' of github.com:coralproject/talk into wordlist	2016-12-12 13:37:43 -05:00
Belén Curcio	55df0f3036	Merge branch 'master' into configure-bug	2016-12-12 14:08:32 -03:00
Belen Curcio	42ff3ae4a2	filter restricted tabs	2016-12-11 23:10:25 -03:00
Belen Curcio	a872128a55	logOut Stae	2016-12-11 22:52:47 -03:00
Riley Davis	9e353eaae8	Merge branch 'master' into simplify-community-page	2016-12-09 15:06:43 -10:00
Riley Davis	0f7e4bd239	simplify Community page	2016-12-09 14:52:17 -10:00
David Jay	faca09dbd2	Merge branch 'master' of github.com:coralproject/talk into update-users-api	2016-12-09 19:35:09 -05:00
David Jay	d229d5a96f	Updating route to davidjay.	2016-12-09 19:28:19 -05:00
Gabriela Rodríguez Berón	02015bc5c3	Merge branch 'master' into flag-bio	2016-12-09 14:26:28 -10:00
gaba	ffc2d0c86a	Spanish translations.	2016-12-09 14:16:27 -10:00
Kim Gardner	5279ad3305	Typo	2016-12-09 13:01:54 -10:00
David Jay	787486bccf	Posting bio flags to backend.	2016-12-09 17:46:45 -05:00
David Jay	9375d8b47d	Merge branch 'flag-username' into flag-bio	2016-12-09 16:46:56 -05:00
David Jay	f5ac576187	Merge branch 'master' of github.com:coralproject/talk into flag-username	2016-12-09 16:33:06 -05:00
David Jay	acd57e4f68	Avoiding double-posting.	2016-12-09 16:15:33 -05:00
David Jay	90ef16e111	Merge branch 'master' of github.com:coralproject/talk into flag-username	2016-12-09 15:51:13 -05:00
David Jay	8e432aad46	Adding Done button to last step of flagging menu.	2016-12-09 15:47:38 -05: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
David Jay	78448b85c1	Updating to reflect new comment api.	2016-12-09 15:11:13 -05: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	bf01543a88	Merge branch 'master' of github.com:coralproject/talk into flag-username	2016-12-09 13:26:48 -05: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
David Jay	ee187469e0	Moving FlagComment to seperate file.	2016-12-09 12:54:15 -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
David Jay	f0108e1434	Fixing bug in addItem in commentStream.	2016-12-08 16:55:42 -05:00
David Jay	e4a13d433f	Removing commas.	2016-12-08 15:48:43 -05:00
David Jay	7f24153b4e	Revert "Removing extra commas and collapsing actions into an object in the backend." ... This reverts commit 9d28577e9b.	2016-12-08 15:47:47 -05:00
David Jay	9d28577e9b	Removing extra commas and collapsing actions into an object in the backend.	2016-12-08 15:27:49 -05:00