1961 Commits

Author	SHA1	Message	Date
David Jay	4a4b92299c	Adding error message.	2016-12-12 18:10:47 -05:00
David Jay	48b1f7fc2b	Moving text to translations file.	2016-12-12 17:45:20 -05:00
David Jay	182c504edb	Updating settings box style.	2016-12-12 17:35:33 -05:00
David Jay	f58ede45d9	Merge branch 'master' into wordlist	2016-12-12 17:20:33 -05:00
David Jay	39479fd9ad	Add character count field.	2016-12-12 17:07:43 -05:00
gaba	83a7ffee6f	Merge branch 'master' into asset-status	2016-12-12 13:03:58 -08:00
gaba	3b131ce315	Removes status field for Asset. Now closedAt and closedMessage are in the settings field.	2016-12-12 13:02:39 -08: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
Riley Davis	c016e29290	separate route for loading comments per user	2016-12-12 13:00:39 -07:00
Riley Davis	c999e1c1a9	use new coralApi fetch	2016-12-12 12:28:10 -07:00
Riley Davis	c9a8d448ba	use plugin CommentHistory component	2016-12-12 12:20:38 -07:00
David Jay	7b113c1931	Merge branch 'master' of github.com:coralproject/talk into wordlist	2016-12-12 13:37:43 -05:00
Riley Davis	a5b2a4ebc0	merge master	2016-12-12 11:35:25 -07:00
Riley Davis	749a5d9853	Merge branch 'master' into use-js-while-rendering	2016-12-12 07:34:36 -10: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	c18f885277	Merge branch 'master' into use-js-while-rendering	2016-12-09 15:06:51 -10:00
Riley Davis	9e353eaae8	Merge branch 'master' into simplify-community-page	2016-12-09 15:06:43 -10:00
Riley Davis	84453ef7bd	Merge branch 'master' into use-js-while-rendering	2016-12-09 14:53:56 -10:00
Riley Davis	0f7e4bd239	simplify Community page	2016-12-09 14:52:17 -10:00
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
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
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
gaba	ffc2d0c86a	Spanish translations.	2016-12-09 14:16:27 -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
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
Riley Davis	1c2ef760ef	remove cruft by pulling out some immutable.js stuff	2016-12-09 11:46:04 -10: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