wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-06 03:41:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,951 Commits 10 Branches 125 Tags
f57fa7cb7bb9753f461c244b956df3a9060efdbb
Commit Graph

2146 Commits

Author SHA1 Message Date
Belen Curcio f57fa7cb7b Update Cache 2017-05-17 23:53:07 -03:00
Belen Curcio 6664f73d2d Best tag working, only Optimistic Missing 2017-05-17 11:57:51 -03:00
Belen Curcio b2f1707f17 Fully working offtopic 2017-05-17 11:19:06 -03:00
Belen Curcio 793f634959 Working tags 2017-05-17 09:01:41 -03:00
Belen Curcio d02412a734 Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags 2017-05-15 18:11:30 -03:00
Belen Curcio c3d02a14a0 Updated queries and hasRoles 2017-05-15 18:11:14 -03:00
Belén Curcio 820ffb14c1 Merge branch 'master' into 142993479-tags 2017-05-15 16:55:47 -03: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 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
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
Belen Curcio 964cc362e7 Login, logout with tokens. WIP 2017-05-12 18:26:24 -03:00
David Erwin ff6a9cf0d5 Merge branch 'master' into 142993479-tags 2017-05-12 15:44:38 -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
Wyatt Johnson 0a8bfe8a38 Merge branch 'master' into 142993479-tags 2017-05-12 07:54:46 -06:00
Wyatt Johnson e2f6d5989a Merge branch 'master' into 142993479-tags 2017-05-12 07:49:02 -06: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
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 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
Gabriela Rodríguez Berón d815d9dc02 Merge branch 'master' into 142993479-tags 2017-05-11 08:30:51 -07: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
Belen Curcio 57d2b81b05 missing _ 2017-05-10 16:05:52 -03:00
Belen Curcio 10e8a32c21 Changes 2017-05-10 15:57:21 -03:00
Belen Curcio 0a2b26b599 Exports 2017-05-10 15:53:33 -03:00
Belen Curcio c3dff79e6e Updated 2017-05-10 15:35:32 -03:00
Belen Curcio 7313aaa473 Merge branch 'config-embed' of github.com:coralproject/talk into config-embed 2017-05-10 15:09:19 -03:00
Belen Curcio 74ffc00c20 Adding changes 2017-05-10 15:02:43 -03:00
Belen Curcio 2673de5059 lintin 2017-05-10 14:59:10 -03:00
Belen Curcio 644d00d5d8 Adding coral-plugin-api 2017-05-10 14:57:24 -03:00
Belén Curcio 07778844dc Merge branch 'master' into config-embed 2017-05-10 14:17:23 -03:00
Belen Curcio cb45e33b41 merge 2017-05-10 14:15:24 -03:00
Belen Curcio 26e5631f52 Changing path for hocs 2017-05-10 14:13:32 -03:00
Belen Curcio 3e1b7591e0 Adds displayName for WrappedReactions and alreadyReacted 2017-05-10 14:07:58 -03:00
Belen Curcio 19bf7f6cf8 Adds displayName for WrappedReactions 2017-05-10 13:58:05 -03:00
Belen Curcio ad24ff78d2 Merge branch 'master' of github.com:coralproject/talk into coral-reaction 2017-05-10 13:46:11 -03:00
Gabriela Rodríguez Berón f1e4f98055 Merge branch 'master' into 142993479-tags 2017-05-10 08:50:28 -07:00
Belén Curcio ca51821d7b Merge branch 'master' into config-embed 2017-05-10 12:01:29 -03:00
Belen Curcio 250a578dd7 lint, and merge conficts 2017-05-10 11:05:21 -03:00
Belén Curcio af89ef45f2 Merge branch 'master' into coral-reaction 2017-05-09 15:54:36 -03:00