Commit Graph

3544 Commits

Author SHA1 Message Date
Belen Curcio 575a3030f9 Smooth transition 2017-08-24 16:40:16 -03:00
Belen Curcio 73058c624f Linting 2017-08-24 16:32:51 -03:00
Belen Curcio 5cb71eaee8 Icon List for Question Box 2017-08-24 16:32:07 -03:00
Belen Curcio 7991188f8d deleting old code from default.css and building QuestionBox component 2017-08-24 14:45:47 -03:00
Chi Vinh Le ddb555e07f Add new sorting variables 2017-08-24 21:30:16 +07:00
Chi Vinh Le df60ac4714 Merge branch 'master' into user-sort 2017-08-24 20:09:44 +07:00
Kiwi 2d7d505913 Merge branch 'master' into banned-words 2017-08-24 13:49:31 +02:00
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 Johnson 763f753928 Merge branch 'master' into refactor-global-dependencies 2017-08-23 11:56:35 -06:00
Kiwi f5eac91e0e Merge branch 'master' into refactor-global-dependencies 2017-08-23 18:02:17 +02:00
Belén Curcio 0961797f8f Merge branch 'master' into banned-words 2017-08-23 10:10:04 -03: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 Gardner 994923cae0 Merge branch 'master' into user-sort 2017-08-23 13:00:12 +01:00
Kim Gardner 2a839250ed Merge branch 'master' into slot-username 2017-08-23 13:00:06 +01:00
Chi Vinh Le 0811c9302d Ignore access from react dev tools 2017-08-23 17:50:35 +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 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
Belen Curcio 9fa1f3d958 Adding auto escape 2017-08-22 16:15:41 -03:00
Wyatt Johnson f85480c0ae Merge branch 'master' into user-sort 2017-08-22 13:04:32 -06:00
Chi Vinh Le fccbcce7a8 Remove global dependency on registry and plugins 2017-08-23 01:41:58 +07:00
Wyatt Johnson b719168b18 Implemented sortBy 2017-08-22 10:11:47 -06:00
Kiwi 4eac739568 Merge branch 'master' into slot-username 2017-08-22 17:41:13 +02: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
Wyatt Johnson 01ed9880f4 comment count optim, prep for sortBy 2017-08-21 15:26:04 -06: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
Wyatt Johnson 7552e34a15 Merge branch 'master' into user-sort 2017-08-21 10:58:18 -06:00
Belen Curcio 663a46896e Merge branch 'master' of github.com:coralproject/talk into slot-username 2017-08-21 12:28:05 -03:00
Belen Curcio 9028c1b4eb Adding fragment Slot 2017-08-21 12:15:53 -03:00
Wyatt Johnson ec2c62a607 Merge branch 'master' into user-sort 2017-08-21 08:48:26 -06:00
Kim Gardner f528fb4345 Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-08-21 15:43:28 +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
Chi Vinh Le 84e4091ea6 Implement TalkProvider 2017-08-21 21:23:59 +07:00
Wyatt Johnson 65e56d36a1 Merge branch 'master' into fix-routes-mount-path 2017-08-21 08:15:20 -06:00
Belen Curcio 0ea2660c97 Adding new Slot: authorName - Deleting Old Code 2017-08-21 10:44:03 -03:00
Kim Gardner df79530982 Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-08-21 12:03:06 +01:00
Kim Gardner 64d760bffc Merge branch 'master' into fix-routes-mount-path 2017-08-21 12:02:57 +01:00