835 Commits

Author	SHA1	Message	Date
David Jay	b674ff45c0	Addressing errors with replies in e2e.	2017-01-27 17:29:23 -05:00
David Jay	f09d9d0a8b	Merge branch 'master' into e2e-env-fix	2017-01-27 14:10:59 -05:00
David Jay	fcf22ef4f9	Adding selenium settings and fixing bug in moderation approval.	2017-01-27 14:07:34 -05:00
Belen Curcio	55a8b4984a	only importing isEqual	2017-01-27 14:58:36 -03:00
David Erwin	c8c160a551	Remove avatar from user cards	2017-01-27 10:16:09 -05:00
David Jay	f06edec6a2	Merge branch 'master' of github.com:coralproject/talk into moderate-bio	2017-01-26 16:38:43 -05:00
David Jay	b6d8a90084	Updating style of UserActions and moving ActionButton to its own component.	2017-01-26 16:36:43 -05:00
David Erwin	f42b8f324a	Merge branch 'master' into hide-premod-links	2017-01-26 16:24:06 -05:00
David Erwin	2086bd7b72	Merge branch 'master' into collapse-replies	2017-01-26 16:17:23 -05:00
David Jay	06331d3c07	Updating bio moderation to graphQL architecture.	2017-01-26 15:31:15 -05:00
Riley Davis	2ad27ef6f9	add a cancel button to the reply box	2017-01-26 13:21:23 -07:00
Riley Davis	3cbe8bb7ac	Stream now tracks what reply box is open	2017-01-26 12:45:14 -07:00
David Erwin	afb246b173	Hiding premod links	2017-01-26 10:46:01 -05:00
Belen Curcio	88169526c3	Missing semicolon	2017-01-26 10:50:53 -03:00
Belen Curcio	4a54c571ed	Open Stream and Closed Stream status	2017-01-26 10:45:50 -03:00
Belen Curcio	853981e21f	Working configure tab and refresh data. Adding uncontrolled components, deleting state	2017-01-26 10:19:49 -03:00
Belen Curcio	74bef18098	user checker	2017-01-26 09:34:47 -03:00
Belen Curcio	64ed10845b	Merge	2017-01-25 21:59:42 -03:00
David Erwin	c4256fd27b	Ditch console logs	2017-01-25 17:44:21 -05:00
David Jay	31abe57cb2	Merge branch 'master' of github.com:coralproject/talk into moderate-bio ... Integrating graphql, updating tests, and preserving transition to ModerationList from CommentList.	2017-01-25 17:15:12 -05:00
David Erwin	e320a9dd20	Merge branch 'master' into streams-by-asset-id	2017-01-25 15:30:44 -05:00
Belen Curcio	ec0dd34d40	Configure tab while you are loggedOff	2017-01-25 16:33:55 -03:00
David Erwin	ad9684acd9	Create load stream by id route	2017-01-25 14:08:19 -05:00
Belen Curcio	7c132600f0	Console log and typo	2017-01-25 11:47:35 -03:00
Belen Curcio	b3eb3e3c43	Updated tests for Comment History	2017-01-25 11:44:51 -03:00
Belen Curcio	d19d2ebe48	My Comment History Working - linted	2017-01-25 11:19:34 -03:00
Belen Curcio	30b6f8d112	my Comment History working 🎉 : TADA :	2017-01-25 11:04:23 -03:00
Belen Curcio	cebc5f2f45	Adding fragment views	2017-01-25 07:09:11 -03:00
Belen Curcio	b1848c28e4	Adding Missing Translations	2017-01-25 07:08:55 -03:00
Belen Curcio	e993330467	Adding fragments 🎉	2017-01-25 05:20:34 -03:00
Belen Curcio	e3b183c565	Items cleanup	2017-01-25 05:15:04 -03:00
Wyatt Johnson	26b7d48f1f	Comment ordering fixed, banned users can't do anything	2017-01-24 17:06:40 -07:00
Wyatt Johnson	b6d917a22b	fixed translation key, enforced moderation setting schema	2017-01-24 16:08:13 -07:00
Wyatt Johnson	2698045e82	Fixed capital	2017-01-24 15:50:37 -07:00
David Erwin	66b0babdde	Merge branch 'graphql' of https://github.com/coralproject/talk into graphql	2017-01-24 17:17:38 -05:00
David Erwin	9435b627b1	Uppercase more enums in coral-admin	2017-01-24 17:17:03 -05:00
Riley Davis	da7349343e	Merged branch graphql into graphql	2017-01-24 15:09:09 -07:00
Riley Davis	62ae297887	make sure the app does not break if you don't have react devtools installed	2017-01-24 15:08:38 -07:00
Belen Curcio	d2acffc19c	linting!	2017-01-24 19:07:53 -03:00
Belen Curcio	054baa0530	çonfig actions not defined	2017-01-24 19:01:45 -03:00
Belen Curcio	fb791a9df9	merge	2017-01-24 18:52:37 -03:00
Belen Curcio	ecfb365c24	log	2017-01-24 18:51:06 -03:00
David Jay	b0acdff34d	Merge branch 'graphql' of github.com:coralproject/talk into graphql	2017-01-24 16:23:27 -05:00
Belen Curcio	6f44b9cba0	Merge branch 'graphql' of github.com:coralproject/talk into graphql	2017-01-24 18:23:11 -03:00
David Jay	7c3f566202	Handling links inside of iframe in via Pym.	2017-01-24 16:21:49 -05:00
Belen Curcio	9edf99730d	Status	2017-01-24 18:21:49 -03:00
David Erwin	5566856542	Merge branch 'graphql' of https://github.com/coralproject/talk into graphql	2017-01-24 16:12:13 -05:00
David Erwin	53dd34f406	Updating admin screen for all caps enums	2017-01-24 16:11:17 -05:00
Belen Curcio	9d7b727f08	Settings container	2017-01-24 18:08:58 -03:00
David Jay	ce73118f53	Loading history links in parent page.	2017-01-24 16:04:03 -05:00