4706 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
KiwiandGitHub	2c57ec3c7c	Merge branch 'master' into bug-killing-spree	2017-06-22 00:47:27 +07:00
Chi Vinh Le	c0e9e4272b	Merge branch 'master' into bug-killing-spree ... Conflicts: client/coral-admin/src/routes/Moderation/components/UserDetail.js	2017-06-22 00:46:17 +07:00
Belén CurcioandGitHub	f6b2a25e72	Merge pull request #687 from coralproject/pat ... Tokens	2017-06-21 14:43:05 -03:00
Wyatt JohnsonandGitHub	bd7443672a	Merge branch 'master' into pat	2017-06-21 11:36:47 -06:00
KiwiandGitHub	c0dcfe5f4e	Merge pull request #694 from coralproject/copy ... withCopyToClipboard & ButtonCopyToClipboard	2017-06-22 00:35:25 +07:00
Wyatt Johnson	91b7cd10f8	fixing all the 👻	2017-06-21 11:35:00 -06:00
Wyatt Johnson	f537b4a772	Merge branch 'master' into pat	2017-06-21 11:34:18 -06:00
Belen Curcio	a9cefd8cbd	deleting old ref	2017-06-21 14:23:51 -03:00
Belen Curcio	f08c2f4152	Merge branch 'copy' of github.com:coralproject/talk into copy	2017-06-21 13:31:53 -03:00
Belen Curcio	cdcd543fe0	good looking export	2017-06-21 13:30:09 -03:00
Belen Curcio	66aec74b38	good looking export	2017-06-21 13:29:44 -03:00
Belen Curcio	85dcc8d0ec	Merge branch 'master' of github.com:coralproject/talk into copy	2017-06-21 13:28:33 -03:00
Chi Vinh Le	9d572f6c3b	Add proptype	2017-06-21 22:27:13 +07:00
Chi Vinh Le	012ff926eb	Use router for 'moderate all' link and only show when necessary	2017-06-21 22:21:42 +07:00
KiwiandGitHub	91fd8ceabd	Merge branch 'master' into copy	2017-06-21 21:52:51 +07:00
Chi Vinh Le	3beb62f837	Merge branch 'master' into bug-killing-spree ... Conflicts: client/coral-admin/src/routes/Moderation/components/UserDetail.js	2017-06-21 21:47:01 +07:00
Chi Vinh Le	57ecba6f33	Remove unessecary binds	2017-06-21 21:36:27 +07:00
Kim GardnerandGitHub	712a53db24	Merge pull request #693 from coralproject/show-version-in-nav ... Show Talk version number in nav	2017-06-21 15:35:52 +01:00
Kim GardnerandGitHub	e2f94aa141	Merge branch 'master' into show-version-in-nav	2017-06-21 14:29:49 +01:00
Kim GardnerandGitHub	f20b9819aa	Merge branch 'master' into copy	2017-06-21 14:29:36 +01:00
Kim Gardner	74fff2f1ac	Add all stories link to story search dropdown	2017-06-21 14:14:33 +01:00
Kim Gardner	79346738d7	Have Moderate this Stream link also default to All	2017-06-21 13:01:23 +01:00
Kim GardnerandGitHub	e16553419d	Merge pull request #686 from coralproject/subscribe-mod-actions ... Mod Queue Live Updates	2017-06-21 12:24:32 +01:00
Kim GardnerandGitHub	dccf182591	Merge branch 'master' into copy	2017-06-21 12:23:50 +01:00
Kim GardnerandGitHub	33057e197f	Merge branch 'master' into show-version-in-nav	2017-06-21 12:23:20 +01:00
Kim GardnerandGitHub	605e759bc6	Merge branch 'master' into pat	2017-06-21 12:22:28 +01:00
Chi Vinh Le	706a12d2e2	No MoreMore	2017-06-21 02:48:59 +07:00
KiwiandGitHub	adeca927a6	Merge branch 'master' into bug-killing-spree	2017-06-21 01:37:46 +07:00
Chi Vinh Le	fc14e9d2fd	Prevent double execution of fetchMore	2017-06-21 01:29:10 +07:00
Chi Vinh Le	49420e152e	Click outside closes TopRightMenu, detect click outside iframe	2017-06-21 01:29:10 +07:00
Chi Vinh Le	644c291d7f	Don't cut off long comment	2017-06-21 01:29:07 +07:00
KiwiandGitHub	40d7500a75	Merge branch 'master' into subscribe-mod-actions	2017-06-20 21:12:09 +07:00
Kim GardnerandGitHub	3d27c4538a	Merge pull request #691 from coralproject/bump-version-2-1-0 ... Bump version 2.1.0	2017-06-20 14:51:36 +01:00
Belen Curcio	942ea7b916	ButtonCopyToClipboard	2017-06-20 10:37:10 -03:00
Chi Vinh Le	4d53a72767	Always default to all queue	2017-06-20 20:00:00 +07:00
Chi Vinh Le	23fcba4ccc	Don't show caret when logged out	2017-06-20 19:55:53 +07:00
Belén CurcioandGitHub	bee4b4454c	Merge branch 'master' into show-version-in-nav	2017-06-20 09:52:50 -03:00
Belén CurcioandGitHub	679c6ce335	Merge branch 'master' into bump-version-2-1-0	2017-06-20 09:52:26 -03:00
Belén CurcioandGitHub	71d2d0ab10	Merge pull request #692 from coralproject/update-readme ... Update README	2017-06-20 09:52:14 -03:00
Belen Curcio	d97fb0a83f	Refs by ReactDOMNode	2017-06-20 09:47:37 -03:00
Chi Vinh Le	14311dc298	Merge branch 'master' into subscribe-mod-actions ... Conflicts: client/coral-admin/src/routes/Moderation/components/Comment.js	2017-06-20 19:34:56 +07:00
Belen Curcio	7faa00c463	withCopyToClipboard	2017-06-20 09:05:01 -03:00
Belen Curcio	d23d426567	Adding the translations	2017-06-20 08:37:53 -03:00
Belen Curcio	fe8f3ae4bb	Moving Copy component	2017-06-20 08:32:08 -03:00
Kim Gardner	646b5be8c8	Show version in nav	2017-06-20 10:48:01 +01:00
Kim GardnerandGitHub	ea12c07cd4	Update README	2017-06-20 10:29:39 +01:00
Kim GardnerandGitHub	bb4cd91b0c	Merge branch 'master' into pat	2017-06-20 10:12:47 +01:00
Kim GardnerandGitHub	dca759a5e0	Bump version 2.1.0	2017-06-20 10:02:10 +01:00
Kim GardnerandGitHub	018b35e42a	Merge pull request #688 from coralproject/fixes ... Bug-Fixes	2017-06-20 09:59:00 +01:00
Kim GardnerandGitHub	672e36c66c	Merge branch 'master' into fixes	2017-06-20 09:54:38 +01:00