120 Commits

Author	SHA1	Message	Date
gaba	da7f39c9e9	Merge branch 'master' into ban-user	2016-12-02 07:58:46 -08:00
gaba	29f547d268	Trying to fix ban user dialog.	2016-12-02 06:35:55 -08:00
gaba	c83f8eb188	Onclick action.	2016-12-01 13:11:44 -08:00
gaba	15eb946f00	Trying to get the Dialog up.	2016-12-01 13:05:10 -08:00
gaba	443cd031d5	Ban button.	2016-11-30 19:20:07 -08:00
Belen Curcio	c38c556002	merge	2016-11-30 20:11:22 -03:00
gaba	2dd3359cb6	Merge branch 'master' into ban-user	2016-11-30 13:31:59 -08:00
David Jay	34671fb327	Fixing filter in moderation queue.	2016-11-30 15:38:43 -05:00
David Jay	03db1de41a	Removing log statement.	2016-11-30 15:15:58 -05:00
Belen Curcio	d90a158298	Bio Tooltips	2016-11-30 17:09:34 -03:00
gaba	a30388682e	Merge branch 'master' into ban-user	2016-11-30 11:26:44 -08:00
gaba	ba47250933	Understanding reducers	2016-11-30 11:12:09 -08:00
David Jay	17b79e1869	Adding user and action data to rejected and flagged comments.	2016-11-30 13:51:43 -05:00
David Jay	94d9f42aa5	Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix	2016-11-30 12:50:44 -05:00
Riley Davis	a7f94fce83	implement coralApi fetch	2016-11-29 14:44:37 -07:00
gaba	8af9e14971	Recovered community admin.	2016-11-29 12:42:25 -08:00
gaba	a5f67e10d6	Reverts the work on ban in the coral-admin getting everything from master for it.	2016-11-29 11:35:55 -08:00
gaba	281d4f6552	Reverting	2016-11-29 11:17:27 -08:00
gaba	abedb36791	Merge branch 'master' into ban-user	2016-11-28 16:04:15 -08:00
David Jay	5f2f70fd51	Fixing bug when adding users to redux.	2016-11-28 18:59:27 -05:00
David Jay	aa048365bd	Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix	2016-11-28 18:43:20 -05:00
Riley Davis	d5ff0f8f28	keep it DRY. add getInit all over the place. update tests	2016-11-28 16:18:19 -07:00
David Jay	79cda54be2	Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix	2016-11-28 17:28:41 -05:00
gaba	144e716db9	Merge branch 'master' into ban-user	2016-11-28 13:00:56 -08:00
David Jay	8af300a9ec	Adding users, comments, and actions to endpoint and moving to store.	2016-11-28 15:51:15 -05:00
Gabriela Rodríguez Berón	31b0453e82	Merge branch 'master' into logout	2016-11-28 12:33:42 -08:00
gaba	6974f30c73	Merge branch 'master' into ban-user	2016-11-28 12:11:46 -08:00
Riley Davis	25d53116f7	remove unused var	2016-11-28 12:49:29 -07:00
Riley Davis	0d7014f77a	add helpers to talk-adapter	2016-11-28 11:50:25 -07:00
Riley Davis	ee0e0ea9ed	import belen's fetch helpers	2016-11-28 11:17:41 -07:00
Belen Curcio	3ebdca33f3	Logout func	2016-11-27 19:37:17 -03:00
gaba	e9fdb2cc00	Merge branch 'issue-89' into ban-user	2016-11-22 17:20:53 -08:00
gaba	e5c02c4274	The field is action_type and not action.	2016-11-22 17:14:24 -08:00
gaba	a192c08496	Merge branch 'master' into ban-user	2016-11-22 14:53:13 -08:00
gaba	822e13914a	Fix changeStatus	2016-11-22 14:52:43 -08:00
David Jay	0d4a029529	Merge pull request #87 from coralproject/add-https-to-script ... Adds https and accessibility to embed code.	2016-11-22 16:13:53 -05:00
David Jay	d04812fd36	Adding https and accessability to embed code.	2016-11-22 16:09:36 -05:00
gaba	1eb2d04136	Icon was missing	2016-11-22 12:35:43 -08:00
gaba	7dc7df2601	Merge branch 'master' into ban-user	2016-11-22 09:30:52 -08:00
Wyatt Johnson	8eacb01484	Added fixes for prod	2016-11-22 09:31:54 -07:00
Wyatt Johnson	00a8c59c96	Merge branch 'master' into admin	2016-11-22 08:31:21 -07:00
Belen Curcio	8108ca09ef	Permissions, views and somestyling	2016-11-22 11:04:56 -03:00
Belen Curcio	c8d7585e90	Added FabButton to CoralUI	2016-11-22 09:34:46 -03:00
Belen Curcio	6e6681a553	Styles and refactor errors	2016-11-22 09:08:08 -03:00
Belen Curcio	f7daa35c41	Active Routes	2016-11-22 08:32:26 -03:00
Bel	b74a1bece3	Link Routes	2016-11-22 08:10:46 -03:00
gaba	0a8ab759b5	Move into setStatus and other actions when banned and unbanned.	2016-11-21 17:01:36 -08:00
Bel	fa190b4b3e	CoralLogo added to Coral-UI as SVG. and Admin session	2016-11-21 18:30:12 -03:00
gaba	3337e95a6c	Move the change status of the user to a ban the user func.	2016-11-21 12:18:19 -08:00
Wyatt Johnson	3abd6cabac	Merge branch 'master' into wordlist	2016-11-21 12:44:08 -07:00