1961 Commits

Author	SHA1	Message	Date
Riley Davis	25d53116f7	remove unused var	2016-11-28 12:49:29 -07:00
gaba	1ec7435ef4	Merge branch 'master' into ban-user	2016-11-28 11:41:31 -08:00
Belen Curcio	d384a69111	Main Tabs	2016-11-28 15:56:14 -03:00
Riley Davis	0d7014f77a	add helpers to talk-adapter	2016-11-28 11:50:25 -07:00
Riley Davis	98c6ef5162	Merge branch 'master' into config-auth-fix	2016-11-28 11:30:28 -07:00
Wyatt Johnson	b0f01cf00f	Initial commit of asset queuing (#97) ... * Initial commit of asset queuing * Addresssing comments	2016-11-28 13:29:39 -05:00
Riley Davis	ee0e0ea9ed	import belen's fetch helpers	2016-11-28 11:17:41 -07:00
Riley Davis	c0eb202858	small refactor on items actions	2016-11-28 10:57:15 -07:00
Riley Davis	d10870c6bb	dispatch update for adding comemnts	2016-11-28 10:54:10 -07:00
Belen Curcio	1dc7db9081	Structure	2016-11-28 14:43:43 -03:00
Belen Curcio	5bb386e16a	Structure	2016-11-28 14:25:30 -03:00
Belen Curcio	4d916be170	Working tabs	2016-11-27 20:54:41 -03:00
Belen Curcio	3ebdca33f3	Logout func	2016-11-27 19:37:17 -03:00
Riley Davis	28520bfd4a	add get comments by user endpoint. refactor getStream to be functional programming	2016-11-23 17:14:51 -07:00
Riley Davis	71d4ddf030	create comment history class	2016-11-23 13:28:20 -07: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
David Jay	a06d1d4bbb	Merge branch 'master' into stream-e2e	2016-11-22 18:58:54 -05:00
David Jay	5ab3fba818	Setting env variables properly in tests.	2016-11-22 18:45:11 -05: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	6e6ba89706	Hiding reply box on post.	2016-11-22 16:51:22 -05:00
David Jay	dea62d8895	Fixing bug with reply author name.	2016-11-22 16:16:10 -05: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
David Jay	3030bf4f22	Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e	2016-11-22 15:04:36 -05:00
David Jay	654e3580e7	Adding second test.	2016-11-22 13:49:21 -05:00
gaba	f7c4e8bf24	Merge branch 'master' into ban-user	2016-11-22 09:35:06 -08:00
gaba	7dc7df2601	Merge branch 'master' into ban-user	2016-11-22 09:30:52 -08:00
David Jay	2e54a51678	Merge branch 'master' into user-integration	2016-11-22 12:09:29 -05:00
Wyatt Johnson	8eacb01484	Added fixes for prod	2016-11-22 09:31:54 -07:00
David Jay	5c532dab5e	Merge branch 'master' of https://github.com/coralproject/talk into user-integration	2016-11-22 11:11:52 -05: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
David Jay	dd060c5fd1	Signing in via e2e and posting comment.	2016-11-21 21:23:48 -05:00
gaba	0a8ab759b5	Move into setStatus and other actions when banned and unbanned.	2016-11-21 17:01:36 -08:00
David Jay	1931c85d67	Merging	2016-11-21 19:23:29 -05:00
David Jay	06686105c4	Merge branch 'master' into connect-reset-to-fe	2016-11-21 19:06:04 -05:00
David Jay	2b9caf8daf	Updating frontend to utilize new action delete endpoint.	2016-11-21 18:00:50 -05:00
David Jay	7aa893ba9e	Adding signing flow to tests.	2016-11-21 17:26:04 -05:00
David Jay	1a648ca20e	Simplifying item references in CommentStream.	2016-11-21 17:12:55 -05:00
David Jay	c6b1e5a800	Adding frontend IDs to facilitate management of actions.	2016-11-21 16:54:01 -05:00
Bel	fa190b4b3e	CoralLogo added to Coral-UI as SVG. and Admin session	2016-11-21 18:30:12 -03:00
David Jay	9afc9640ee	Merge branch 'user-integration' of https://github.com/coralproject/talk into notification-room	2016-11-21 16:26:22 -05:00
David Jay	56205aee74	Expanding dialog box for signin.	2016-11-21 16:19:27 -05:00