592 Commits

Author	SHA1	Message	Date
Riley Davis	1239141eb9	use setIn to simplify	2016-12-22 14:11:04 -07:00
Riley Davis	a9a9ebdfd9	normalize constant names	2016-12-22 13:53:42 -07:00
Riley Davis	9d1d109ec0	Merge branch 'master' ... Conflicts: client/coral-admin/src/reducers/index.js	2016-12-22 12:28:55 -07:00
Riley Davis	e37696e64f	Merge branch 'master' into docs-add-reactions	2016-12-22 12:17:49 -07:00
David Jay	5e01fe4025	Fixing bug in text box display.	2016-12-22 11:01:59 -08:00
Riley Davis	7c999e2cc8	Merge branch 'master' into add-flag-option	2016-12-22 11:20:05 -07:00
Riley Davis	b723d72254	Merge branch 'master' into font-size-docs	2016-12-22 10:40:30 -07:00
Riley Davis	c6170f558a	Merge branch 'master' into add-flag-option	2016-12-22 10:38:34 -07:00
David Jay	fdf5da56cf	Merge branch 'admin-asset-list' of github.com:coralproject/talk into admin-asset-list	2016-12-21 18:11:51 -08:00
David Jay	0fc3e09c74	Removing unused log statement and combining setState functions.	2016-12-21 18:08:57 -08:00
Riley Davis	b8b47e9c2c	normalize constant names	2016-12-21 16:56:29 -07:00
Riley Davis	7fc3dffc77	reload assets after updating state	2016-12-21 16:49:53 -07:00
Riley Davis	7cbd06834f	set defaults on fetchAssets	2016-12-21 16:39:29 -07:00
David Jay	c867ae8eeb	Removing Next and Prev from pager and updating tests.	2016-12-21 12:11:42 -08:00
David Jay	cfed42be2c	Correcting bug in fetchAssets.	2016-12-21 12:05:25 -08:00
David Jay	29fa26260c	Handling undefined values in fetchAssets call.	2016-12-21 11:39:21 -08:00
Riley Davis	4f9e793810	remove logs	2016-12-21 11:23:08 -07:00
riley	f5b8c0bbba	fix lint	2016-12-21 11:19:17 -07:00
Riley Davis	18d4c58a48	allow pasting comma-separated lists	2016-12-21 11:12:09 -07:00
David Jay	a490aaeaf0	Merge branch 'master' of github.com:coralproject/talk into admin-asset-list	2016-12-20 17:02:24 -08:00
David Jay	0235d26295	Correcting accidentally moved pager files.	2016-12-20 16:34:27 -08:00
David Jay	7faa3eeecf	Merge branch 'master' of github.com:coralproject/talk into add-flag-option	2016-12-20 16:23:39 -08:00
Riley Davis	9315337ce6	suspect words are marked up	2016-12-20 16:56:16 -07:00
Riley Davis	ef0055e689	highlight suspect words	2016-12-20 16:42:16 -07:00
Riley Davis	9e0ab7d2a1	load actions in a reducer	2016-12-20 15:47:27 -07:00
David Jay	c85daa2ece	Merge branch 'master' into docs-add-reactions	2016-12-20 13:53:49 -08:00
Riley Davis	652a41971b	Merge branch 'master' ... Conflicts: client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js	2016-12-20 14:51:36 -07:00
David Jay	c4510c1abf	Updating action documentation.	2016-12-20 13:43:38 -08:00
Riley Davis	7351aecade	update user constants	2016-12-20 13:48:00 -07:00
Riley Davis	55c5f6d5be	use spread operator. update action constants	2016-12-20 13:25:21 -07:00
Riley Davis	96141d8abc	remove status from new comment	2016-12-20 13:23:36 -07:00
David Jay	d7829232a3	Making font sizes relative.	2016-12-20 12:00:56 -08:00
Riley Davis	7a1c3e730b	fix lint	2016-12-20 12:56:44 -07:00
Riley Davis	96ed008b96	remove some more string literals	2016-12-20 12:50:12 -07:00
Riley Davis	0a19a284ab	simplify banUser dialog action creators	2016-12-20 12:47:23 -07:00
Riley Davis	268f6616a5	update the status correctly	2016-12-20 12:45:30 -07:00
Riley Davis	11d8b2cd91	update a comment's status	2016-12-20 12:39:57 -07:00
David Jay	a3eb4f5c76	Merge branch 'add-flag-option' of github.com:coralproject/talk into add-flag-option	2016-12-20 11:31:57 -08:00
David Jay	889f29739c	Merge branch 'master' into add-flag-option	2016-12-20 11:22:38 -08:00
Riley Davis	b4b3420549	remove banUser and create fetchModerationQueueComments actions	2016-12-20 12:21:10 -07:00
Riley Davis	8849dcbf5c	add propTypes to CommentList	2016-12-20 10:29:49 -07:00
David Jay	be3d506459	Moving action metadata to nested object.	2016-12-19 20:10:42 -05:00
Riley Davis	706cefad9e	simplify wordlist ui further	2016-12-19 16:49:05 -07:00
Riley Davis	123ba07b63	add tag package to simplify wordlist ui	2016-12-19 16:43:00 -07:00
Riley Davis	86c74d69c7	save wordlist to the server	2016-12-19 15:03:18 -07:00
Riley Davis	7742dbf9a2	add a suspect words card	2016-12-19 13:07:50 -07:00
David Jay	4d508f6afa	Merge branch 'master' of github.com:coralproject/talk into admin-asset-list	2016-12-19 13:41:43 -05: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