 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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Belen Curcio
|
c3dff79e6e
|
Updated
|
2017-05-10 15:35:32 -03:00 |
|
|
Wyatt Johnson
|
a3a8d23797
|
patched bug with adding action
|
2017-05-10 12:18:42 -06: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 |
|
|
Belén Curcio
|
67c202d89f
|
Merge pull request #577 from coralproject/admin-slots
Admin Mod Queue Slots and Coral Plugin Mod example
|
2017-05-10 13:53:20 -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 |
|
|
Benjamin Goering
|
650e8e205e
|
Merge branch 'edit-comment' of github.com:gobengo/talk into edit-comment
|
2017-05-09 15:03:19 -07:00 |
|
|
Benjamin Goering
|
f37a210479
|
Only use errors from errors.js for EditWindowHasEnded
|
2017-05-09 15:02:26 -07:00 |
|
|
Wyatt Johnson
|
0d47ee895c
|
removed unused service
|
2017-05-09 15:02:31 -06:00 |
|