8345 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kim Gardner	c4985e0007	Merge branch 'master' into talk-plugin-avatar	2017-07-11 12:02:17 -04:00
David Erwin	066d9ce0ec	Merge pull request #745 from coralproject/docs-features ... Docs Architecture	2017-07-11 11:55:41 -04:00
David Erwin	dc6fa74d22	Add more clarity	2017-07-11 11:51:02 -04:00
David Erwin	e9e79b4605	Merge branch 'docs-features' of https://github.com/coralproject/talk into docs-features	2017-07-11 11:06:25 -04:00
David Erwin	1d9b627d73	Fix typos and clarify	2017-07-11 11:05:58 -04:00
Chi Vinh Le	40f4419c9d	Add flagged unflagged CSS classnames	2017-07-11 21:54:35 +07:00
Chi Vinh Le	8b70dc688d	Adapt CSS classnames for Embed	2017-07-11 21:03:27 +07:00
Chi Vinh Le	b05a6c00ce	Correct aria-controls	2017-07-11 20:37:19 +07:00
Kim Gardner	f0bdee415b	Merge branch 'master' into featured-comments	2017-07-11 08:18:31 -04:00
Kim Gardner	9063b8adf1	Merge branch 'master' into docs-features	2017-07-11 08:18:25 -04:00
Kim Gardner	01fd667eb4	Merge branch 'master' into talk-plugin-avatar	2017-07-11 08:17:49 -04:00
Kim Gardner	73ac8d16ef	Merge branch 'master' into create-plugin	2017-07-11 08:13:59 -04:00
Kim Gardner	ced449a148	Merge pull request #747 from coralproject/fix-permalink-live-update ... Fix perma view live updates	2017-07-11 08:12:59 -04:00
Kim Gardner	ffad851066	Merge branch 'master' into fix-permalink-live-update	2017-07-11 07:49:16 -04:00
Kim Gardner	4281fd590c	Merge pull request #750 from coralproject/no-label-on-mobile ... Remove labels for comment actions on mobile.	2017-07-11 07:46:11 -04:00
Belen Curcio	0c167fdfc4	Removing talk-plugin-avatar	2017-07-10 17:43:51 -03:00
Belen Curcio	5dfb372c42	Merge branch 'master' of github.com:coralproject/talk	2017-07-10 17:11:06 -03:00
Belen Curcio	932103c204	updated yarn lock	2017-07-10 17:08:49 -03:00
Belen Curcio	666225614b	Merge branch 'talk-plugin-avatar' of github.com:coralproject/talk into talk-plugin-avatar	2017-07-10 17:06:57 -03:00
Belen Curcio	636f357186	Reverting changes from old branch	2017-07-10 17:06:40 -03:00
Belén Curcio	be6337f17c	Merge branch 'master' into talk-plugin-avatar	2017-07-10 17:05:56 -03:00
Belen Curcio	2c7f5ca089	linting	2017-07-10 17:00:01 -03:00
Belen Curcio	f09550a4ac	Avatar plugin support extending fragments	2017-07-10 16:56:46 -03:00
Belen Curcio	3c3a0523de	Avatar support	2017-07-10 16:27:15 -03:00
Chi Vinh Le	a2dabcac0e	Hide action labels on mobile	2017-07-11 01:26:25 +07:00
Wyatt Johnson	a686bc75a7	Some changes to server side stuff + tempalte location	2017-07-10 10:30:20 -06:00
Chi Vinh Le	8960f67a4d	Add todo comments	2017-07-10 22:49:06 +07:00
Chi Vinh Le	e10c1f1a1f	Docs	2017-07-10 22:45:28 +07:00
Chi Vinh Le	55e70dfbec	Fix perma view live updates	2017-07-10 22:13:04 +07:00
Chi Vinh Le	af46e3a7b1	Merge branch 'master' into extendable-tab-menu ... Conflicts: client/coral-embed-stream/src/components/Comment.js	2017-07-10 22:03:32 +07:00
Chi Vinh Le	883dfedfab	Fix new count styles	2017-07-10 21:57:25 +07:00
Chi Vinh Le	ae52b27009	Don't use div inside p	2017-07-10 21:53:55 +07:00
Chi Vinh Le	34a4a005d1	Add margin to highlighted comment	2017-07-10 21:12:52 +07:00
Chi Vinh Le	ab72995a2c	Implement streamTabs and streamTabPanes slot	2017-07-10 20:46:28 +07:00
Chi Vinh Le	aac47c4686	Add margin	2017-07-10 17:57:45 +07:00
Chi Vinh Le	362c072181	If only one tab left make it not clickable	2017-07-10 17:03:07 +07:00
Chi Vinh Le	ef172ae5f8	Change streamBox to streamFilter	2017-07-10 17:03:07 +07:00
Chi Vinh Le	1e4e1cb413	Implement Stream TabBar	2017-07-10 17:03:06 +07:00
Belén Curcio	e819b96473	Merge branch 'master' into create-plugin	2017-07-09 12:21:49 -03:00
Belen Curcio	1e3c1feadf	cta	2017-07-09 12:09:54 -03:00
Belen Curcio	83d7e599c7	pushing client template	2017-07-09 12:09:07 -03:00
David Erwin	52d7ba8965	Add Tags docs	2017-07-07 16:59:18 -04:00
Belen Curcio	c3ec772ea2	new cta for questions	2017-07-07 14:43:46 -03:00
David Erwin	d2b4c2bcac	Add architecture docs	2017-07-07 13:43:05 -04:00
Kim Gardner	f738da4dd5	Merge pull request #744 from coralproject/redis-flush ... Flush Redis before each test v2.3.0	2017-07-07 16:19:52 +01:00
Kim Gardner	b796bf2607	Merge branch 'master' into redis-flush	2017-07-07 16:06:22 +01:00
Kim Gardner	3924ced659	Merge pull request #743 from coralproject/change-org-name ... Added new cli-settings	2017-07-07 16:01:55 +01:00
Wyatt Johnson	23573501bd	Configured redis to flush before each test and changed default test ... redis database	2017-07-07 08:57:56 -06:00
Wyatt Johnson	787c00325d	Added new cli-settings	2017-07-07 08:40:18 -06:00
Kim Gardner	db371d1c82	Merge pull request #742 from coralproject/bump-version-2-3-0 ... Update version number	2017-07-07 15:25:36 +01:00