Commit Graph
5720 Commits
Author SHA1 Message Date
Chi Vinh Le a42d668329 Merge branch 'refactor-global-dependencies' of ssh://github.com/coralproject/talk into refactor-global-dependencies 2017-08-24 18:47:09 +07:00
Chi Vinh Le 645aaa09ae Add some docs 2017-08-24 18:40:38 +07:00
Wyatt JohnsonandGitHub 763f753928 Merge branch 'master' into refactor-global-dependencies 2017-08-23 11:56:35 -06:00
Belén CurcioandGitHub 3f83a8f1a9 Merge pull request #868 from coralproject/slot-username
New Slot: commentAuthorName
2017-08-23 14:20:41 -03:00
KiwiandGitHub f5eac91e0e Merge branch 'master' into refactor-global-dependencies 2017-08-23 18:02:17 +02:00
Chi Vinh Le ce360a47f8 Add slot to fragments in featured comments 2017-08-23 22:40:48 +07:00
Chi Vinh Le 1bcf31d22d Merge branch 'slot-username' of ssh://github.com/coralproject/talk into slot-username 2017-08-23 20:15:44 +07:00
Chi Vinh Le ceba418e28 created_at is a Date 2017-08-23 20:14:55 +07:00
Chi Vinh Le c2b0a60d8a Remove global dependency on router history 2017-08-23 20:02:36 +07:00
Chi Vinh Le bf89409f60 Remove global dependency on Storage 2017-08-23 19:53:06 +07:00
Kim GardnerandGitHub 2a839250ed Merge branch 'master' into slot-username 2017-08-23 13:00:06 +01:00
Kim GardnerandGitHub dcf09adc1c Merge pull request #872 from coralproject/missing-fragment
Add missing fragment field to Comment
2017-08-23 12:59:38 +01:00
KiwiandGitHub 7ff4a2e75d Merge branch 'master' into slot-username 2017-08-23 13:09:46 +02:00
Kim GardnerandGitHub 2d1bf32464 Merge branch 'master' into missing-fragment 2017-08-23 12:04:24 +01:00
Chi Vinh Le 0811c9302d Ignore access from react dev tools 2017-08-23 17:50:35 +07:00
Kim GardnerandGitHub a5f7a7cd75 Merge pull request #871 from coralproject/graphiql-fix
Template bug fix
2017-08-23 11:41:29 +01:00
Chi Vinh Le 4dd20260a8 Unprotect User.created_at 2017-08-23 17:32:29 +07:00
Chi Vinh Le 5eafb672ef Add missing fragment field to Comment 2017-08-23 17:07:28 +07:00
Chi Vinh Le 61e601a2a5 Merge branch 'master' into refactor-global-dependencies 2017-08-23 04:05:56 +07:00
Chi Vinh Le a9e3115bd9 Expose getErrorMessages in plugin-api 2017-08-23 03:53:37 +07:00
Chi Vinh Le a23bad49c6 Remove global dependency on notification on admin 2017-08-23 03:48:20 +07:00
Chi Vinh Le 89037a2e05 Refactor notification 2017-08-23 03:22:56 +07:00
Chi Vinh Le f428bfa6c9 WIP 2017-08-23 03:16:19 +07:00
Chi Vinh Le 1ee7c81675 Remove admin store impl 2017-08-23 02:24:26 +07:00
Chi Vinh Le a934722672 Cleanup 2017-08-23 02:23:18 +07:00
Chi Vinh Le a882b36501 Fix connection bug 2017-08-23 02:20:43 +07:00
Wyatt Johnson 23f4724f99 fixed template bug 2017-08-22 13:18:48 -06:00
Chi Vinh Le fccbcce7a8 Remove global dependency on registry and plugins 2017-08-23 01:41:58 +07:00
KiwiandGitHub 4eac739568 Merge branch 'master' into slot-username 2017-08-22 17:41:13 +02:00
Kim GardnerandGitHub 8ecf243d2d Merge pull request #869 from coralproject/admin-reply
Reply Badge - Admin Side
2017-08-22 16:37:42 +01:00
Chi Vinh Le 54ea0b1a3f Remove global dependency on store, rest, pym and apollo client 2017-08-22 22:04:49 +07:00
Belen Curcio cb4d2998f6 Removing logic from ReplyBadge 2017-08-22 09:40:49 -03:00
Belen Curcio c402627280 Adding Reply Badge to User History 2017-08-21 17:27:32 -03:00
Belen Curcio 647b5ed745 Adding Reply Badge 2017-08-21 17:09:26 -03:00
Belen Curcio a540dfe8d4 Adding hasParent on Comment to the Graph 2017-08-21 16:21:39 -03:00
Belen Curcio 19dfe86118 Updates 2017-08-21 14:53:24 -03:00
Belen Curcio cea6f7b8e8 Deleting Reference to FakeComment 2017-08-21 14:26:22 -03:00
Belen Curcio 9bff90bd4d Adding Slot to Featured Comments 2017-08-21 13:18:46 -03:00
Belen Curcio 22f473a9ea Merge branch 'slot-username' of github.com:coralproject/talk into slot-username 2017-08-21 12:28:24 -03:00
Belen Curcio 663a46896e Merge branch 'master' of github.com:coralproject/talk into slot-username 2017-08-21 12:28:05 -03:00
Belén CurcioandGitHub bfa195d7cb Merge branch 'master' into slot-username 2017-08-21 12:27:00 -03:00
Belen Curcio 9028c1b4eb Adding fragment Slot 2017-08-21 12:15:53 -03:00
Kim GardnerandGitHub 8b044954d9 Merge pull request #865 from clintabrown/fix-routes-mount-path
Fix paths when TALK_ROOT_URL_MOUNT_PATH is set to true
v3.2.0
2017-08-21 15:43:02 +01:00
Chi Vinh Le d47287fbd5 Remove unused import 2017-08-21 21:39:40 +07:00
Chi Vinh Le 74f778aef7 Merge branch 'master' into talk-provider
Conflicts:
	client/coral-embed-stream/src/containers/Embed.js
	plugin-api/beta/client/hocs/withReaction.js
2017-08-21 21:38:39 +07:00
Chi Vinh Le 9566f83eac Remove coral-framework reducers
Some of them were only related to the embed stream.
Auth code is too convoluted with the embed stream and can't be reused atm.
2017-08-21 21:31:54 +07:00
Wyatt JohnsonandGitHub 170ca044fe Merge branch 'master' into fix-routes-mount-path 2017-08-21 08:29:37 -06:00
Kim GardnerandGitHub ccf978f87c Merge pull request #867 from coralproject/trust-defaults-change
Changed trust defaults
2017-08-21 15:29:18 +01:00
Chi Vinh Le 84e4091ea6 Implement TalkProvider 2017-08-21 21:23:59 +07:00
Wyatt JohnsonandGitHub 65e56d36a1 Merge branch 'master' into fix-routes-mount-path 2017-08-21 08:15:20 -06:00