Commit Graph

3900 Commits

Author SHA1 Message Date
Belén Curcio afa3123829 Merge pull request #578 from coralproject/auth-tokens
JWT Auth
2017-05-15 16:51:10 -03:00
Wyatt Johnson 5aca83993b fixed build process 2017-05-15 13:35:51 -06:00
Wyatt Johnson 8ff0c3db51 Merge branch 'auth-tokens' of github.com:coralproject/talk into auth-tokens 2017-05-15 13:14:10 -06:00
Belen Curcio 75aa8d79df linting 2017-05-15 14:50:26 -03:00
Belen Curcio 843c3a16c8 Admin share same network interface, and unifying actions 2017-05-15 14:48:12 -03:00
Belen Curcio 4e86e4197c handling logout 2017-05-15 13:13:28 -03:00
Belen Curcio 5dae7bf4ac Merge branch 'master' of github.com:coralproject/talk into auth-tokens 2017-05-15 13:12:11 -03:00
Belen Curcio 48370db09a Merge branch 'auth-tokens' of github.com:coralproject/talk into auth-tokens 2017-05-15 13:11:32 -03:00
Wyatt Johnson 9bee31198e Added logout routes 2017-05-15 10:03:09 -06:00
Kim Gardner 2a95c1eee2 Merge pull request #583 from coralproject/hooks-docs
[DOCS] - Hooks and Reactions
2017-05-15 11:55:41 -04:00
Belen Curcio 57ced201eb WebStorage events 2017-05-15 12:52:54 -03:00
Belen Curcio 370cdf8c09 Ádding middlewares to our network interface 2017-05-15 12:51:07 -03:00
Kim Gardner cb64d599fe Merge branch 'master' into hooks-docs 2017-05-15 11:50:46 -04:00
Belen Curcio 292f758ac9 Comment history relies on authtokens 2017-05-15 12:17:30 -03:00
Belen Curcio 76b96a66a2 Adding Bearer token to the Graph Client 2017-05-15 11:41:36 -03:00
Belen Curcio 8754ade5a4 merge 2017-05-12 21:52:29 -03:00
Wyatt Johnson e218de811b removed csrf reference 2017-05-12 15:53:25 -06:00
Belen Curcio 964cc362e7 Login, logout with tokens. WIP 2017-05-12 18:26:24 -03:00
David Erwin 7c5e04e820 Merge pull request #584 from coralproject/prevent-empty-edit
Prevent empty edit on the Front-End
2017-05-12 15:44:14 -04:00
Belen Curcio 7fd5509490 Prettier 2017-05-12 15:48:19 -03:00
Belen Curcio 5e8a02c461 Removing CSRF 2017-05-12 15:40:53 -03:00
Chi Vinh Le 072437b0fd Prevent empty edit 2017-05-12 22:45:33 +07:00
Belen Curcio 674ac50035 Ádding reaction docs 2017-05-12 12:29:02 -03:00
Belen Curcio 0eb88b30eb Merge branch 'master' of github.com:coralproject/talk into hooks-docs 2017-05-12 12:19:26 -03:00
Belen Curcio e5a4fbc1cd DOCS Hooks 2017-05-12 12:07:55 -03:00
David Erwin ce583142ef Merge pull request #567 from coralproject/query-mutation-api
Extendable GraphQL framework
2017-05-12 09:43:50 -04:00
Chi Vinh Le 95a7a1ca47 Rename registry 2017-05-12 20:15:04 +07:00
Chi Vinh Le 7857cadef5 Merge branch 'master' into query-mutation-api
Conflicts:
	client/coral-embed-stream/src/components/Comment.js
	client/coral-embed-stream/src/containers/Embed.js
	client/coral-embed-stream/src/containers/Stream.js
	client/coral-embed-stream/src/index.js
	client/coral-framework/graphql/fragments/commentView.graphql
	client/coral-framework/graphql/mutations/index.js
	client/coral-framework/hocs/index.js
	client/coral-framework/hocs/withFragments.js
2017-05-12 19:50:36 +07:00
Kim Gardner 5c5d014e23 Merge pull request #563 from gobengo/edit-comment
Edit comment
2017-05-11 14:28:33 -04:00
Benjamin Goering 923e20f867 Merge branch 'master' into edit-comment 2017-05-11 10:42:41 -07:00
Benjamin Goering cd7b1f2b2b editComment mutation doesn't refetch streamQuery. Instead a reducer updates streamQuery client-side 2017-05-11 10:38:48 -07:00
Kim Gardner c44eb373c3 Merge pull request #559 from coralproject/config-embed
Config via Embed - Add external config passed into the script tag
2017-05-11 12:56:47 -04:00
Kim Gardner 49d0c9bd10 Merge branch 'master' into config-embed 2017-05-11 12:40:11 -04:00
Benjamin Goering cb90802896 Fix bad merge when CommentBox calls setCommentCountCache 2017-05-11 09:34:33 -07:00
Kim Gardner 30bb954e44 Merge pull request #582 from coralproject/losowsky-patch-1
removed the beta tag
2017-05-11 12:17:41 -04:00
Kim Gardner 4cd2a15f35 Merge branch 'master' into losowsky-patch-1 2017-05-11 12:05:32 -04:00
Kim Gardner a1f3f550db Merge pull request #580 from coralproject/dont-unreport
remove ability to un-flag a comment
2017-05-11 11:42:15 -04:00
Andrew Losowsky 604894e43c removed the beta tag
we left beta a while ago!
2017-05-11 11:11:37 -04:00
Riley Davis ebf4f7ecc9 Merge branch 'master' into dont-unreport 2017-05-11 09:00:57 -06:00
Wyatt Johnson db94158426 Merge pull request #581 from coralproject/license-update
Update LICENSE
2017-05-11 07:59:29 -06:00
Kim Gardner ef502bf7a8 Update LICENSE 2017-05-11 09:46:04 -04:00
Belén Curcio 06b90041af Merge branch 'master' into config-embed 2017-05-11 09:46:58 -03:00
Riley Davis c3048e599d remove ability to un-flag a comment 2017-05-10 20:57:20 -06:00
Kim Gardner 1314f1972a Merge branch 'master' into edit-comment 2017-05-10 15:25:27 -04:00
Belén Curcio 0c07e39cc0 Merge pull request #571 from coralproject/coral-reaction
Coral Reactions and Coral Plugin Love
2017-05-10 16:12:32 -03:00
Belen Curcio 57d2b81b05 missing _ 2017-05-10 16:05:52 -03:00
Belen Curcio a75070cf2e Merge branch 'config-embed' of github.com:coralproject/talk into config-embed 2017-05-10 16:05:16 -03:00
Belén Curcio 2d6c26887a Merge branch 'master' into config-embed 2017-05-10 16:05:04 -03:00
Belén Curcio 7626330ee1 Merge branch 'master' into coral-reaction 2017-05-10 16:02:01 -03:00
Belen Curcio 2fc54ac529 Merge branch 'master' of github.com:coralproject/talk into config-embed 2017-05-10 15:59:09 -03:00