 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 |
|
|
Wyatt Johnson
|
f4dfb21e15
|
reverted pagination work
|
2017-05-12 09:14:25 -06:00 |
|
|
Belen Curcio
|
e5a4fbc1cd
|
DOCS Hooks
|
2017-05-12 12:07:55 -03:00 |
|
|
Wyatt Johnson
|
0a8bfe8a38
|
Merge branch 'master' into 142993479-tags
|
2017-05-12 07:54:46 -06:00 |
|
|
Wyatt Johnson
|
e6b2ff19b8
|
fixing graph merge error
|
2017-05-12 07:51:53 -06:00 |
|
|
Wyatt Johnson
|
e2f6d5989a
|
Merge branch 'master' into 142993479-tags
|
2017-05-12 07:49:02 -06: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 |
|
|
Wyatt Johnson
|
47186c4eac
|
some changes to loaders
|
2017-05-11 17:52:07 -06:00 |
|
|
Wyatt Johnson
|
ae5da93730
|
linting fixes
|
2017-05-11 17:44:51 -06:00 |
|
|
Wyatt Johnson
|
a65d045c65
|
lint fixes
|
2017-05-11 17:38:49 -06:00 |
|
|
Wyatt Johnson
|
08e7a90d69
|
lint fixes
|
2017-05-11 17:34:47 -06:00 |
|
|
Wyatt Johnson
|
547ba126be
|
cleanup to mutators
|
2017-05-11 17:31:22 -06:00 |
|
|
Wyatt Johnson
|
d497ad3369
|
initial pagination rewrite, cleanups to comment edit
|
2017-05-11 17:27:02 -06:00 |
|
|
gaba
|
3b80ee8b13
|
Add YAML loader. Fix i18n module to get YAML files.
|
2017-05-11 15:05:09 -07:00 |
|
|
Wyatt Johnson
|
0d957bcfb9
|
Code cleanup related to old tag services
|
2017-05-11 14:56:36 -06:00 |
|
|
Wyatt Johnson
|
899805b956
|
Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags
|
2017-05-11 14:42:37 -06:00 |
|
|
Wyatt Johnson
|
aeaf809a0f
|
Made queries more generic related to tags
|
2017-05-11 14:42:06 -06:00 |
|
|
Riley Davis
|
14b483d089
|
create roles helper
|
2017-05-11 14:23:02 -06: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 |
|
|
gaba
|
653091fdf9
|
Merge branch 'master' into i18n-refactor
|
2017-05-11 09:02:21 -07: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 |
|
|
Gabriela Rodríguez Berón
|
d815d9dc02
|
Merge branch 'master' into 142993479-tags
|
2017-05-11 08:30:51 -07: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 |
|
|
riley
|
964b934efb
|
Merge branch 'master' into multiple-roles
|
2017-05-11 08:51:06 -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 |
|
|
Belen Curcio
|
10e8a32c21
|
Changes
|
2017-05-10 15:57:21 -03:00 |
|
|
Belen Curcio
|
0a2b26b599
|
Exports
|
2017-05-10 15:53:33 -03:00 |
|
|
David Erwin
|
4f74d28602
|
Merge pull request #579 from coralproject/action-fix
Patched bug with adding action
|
2017-05-10 14:39:25 -04:00 |
|