261 Commits

Include renames

Author	SHA1	Message	Date
Dan Zajdband	759e74a88d	coral-admin: Fixed check for component unmount removing a listener when there is no object	2017-01-03 10:46:55 -03:00
Belen Curcio	8d992f7809	merg	2016-12-23 16:13:36 -03:00
Belen Curcio	168248f975	Presentational and Container Components added	2016-12-23 16:09:46 -03:00
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 DavisandGitHub	6cca99e75e	Merge branch 'master' into map-dispatch-mod-queue	2016-12-22 12:25:51 -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	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	50112d3166	create mapStateToProps	2016-12-21 12:22:54 -07: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
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
Riley Davis	652a41971b	Merge branch 'master' ... Conflicts: client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js	2016-12-20 14:51:36 -07: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
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
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
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
Belen Curcio	2d9ee1d9d7	Moderaion Queue updated to master	2016-12-19 13:34:42 -03:00
Belen Curcio	f52a1668b0	Test logouts and approves after commenting	2016-12-18 19:07:31 -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ónandGitHub	4f0c0d2e42	Merge branch 'master' into fix-config-warnings	2016-12-16 17:44:21 -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	8f1a6a777c	Merge branch 'master' of github.com:coralproject/talk into admin-asset-list	2016-12-16 17:22:32 -05:00
David Jay	c34bf5036e	Updating page count.	2016-12-16 17:20:31 -05:00
Riley Davis	13994686e4	fix some config warnings	2016-12-16 15:20:02 -07:00
David Jay	0d2d6b52a5	Adding pagination.	2016-12-16 17:07:59 -05:00
David Jay	979b54166b	Updating search with delay.	2016-12-16 16:24:32 -05:00