Commit Graph

2825 Commits

Author SHA1 Message Date
Kim Gardner ef22909c6c Merge branch 'master' into comment-context-label 2017-07-31 15:29:28 -04:00
Kim Gardner 109ef0cea4 Merge branch 'master' into comment-stream-tag-uniformity 2017-07-31 15:16:17 -04:00
Chi Vinh Le 62a559b6fc "Don't agree" is not a flag action 2017-08-01 00:37:18 +07:00
Chi Vinh Le 3954b7a268 Label for inactive comments 2017-07-31 22:53:35 +07:00
Samantha Hankins 70dcf2162f create uniformity on tag label styling 2017-07-31 10:52:26 -04:00
Chi Vinh Le 97c75be604 Comments explaining why we have inactive comments in the stream 2017-07-31 20:17:06 +07:00
Chi Vinh Le fc3acecf61 Refactor isCommentActive logic 2017-07-31 20:09:16 +07:00
Wyatt Johnson b8eacf43a6 Merge branch 'master' into embed-control-object 2017-07-31 10:25:43 +10:00
Wyatt Johnson 299bb35c9d added more path fixes 2017-07-31 09:52:46 +10:00
Kiwi b9583dd55d Merge branch 'master' into embed-control-object 2017-07-28 19:31:31 +02:00
Chi Vinh Le 85e478cf3f Return an object on Talk.render to control the embed 2017-07-29 00:17:23 +07:00
Belén Curcio 8aa086af02 Merge branch 'master' into optimize-permalink-queries 2017-07-28 13:21:59 -03:00
Kim Gardner 7dd20d740d Merge branch 'master' into view-context-non-public 2017-07-28 10:58:54 -04:00
Chi Vinh Le 91bc7eaa53 Make condition more clear 2017-07-28 20:10:03 +07:00
Belén Curcio 58a6333e02 Merge branch 'master' into user-detail-everywhere 2017-07-28 09:57:34 -03:00
Chi Vinh Le 7323c92b26 Optimize query during permalink view 2017-07-28 19:43:33 +07:00
Chi Vinh Le 1f3d97fd6b Allow admins / mods to view context of rejected or premod comments 2017-07-28 18:03:35 +07:00
Kiwi d5b7fd0413 Merge branch 'master' into user-detail-everywhere 2017-07-27 22:12:52 +02:00
Chi Vinh Le 389ff0ca0d Change reducer property names 2017-07-28 03:03:19 +07:00
Chi Vinh Le 7a9aa331c5 viewUserDetail everywhere 2017-07-28 02:50:32 +07:00
Kim Gardner 673cb0ed04 Merge branch 'master' into basepath 2017-07-27 15:21:31 -04:00
Chi Vinh Le ce2f8f97e8 Move userDetail out of Moderation route 2017-07-27 23:23:40 +07:00
Chi Vinh Le 57fb77008a Make UserDetail work independently 2017-07-27 21:44:29 +07:00
Wyatt Johnson 0d7e4d6541 Added support for hosting Talk under a different path 2017-07-27 16:37:26 +10:00
Kim Gardner 22b3a59351 Merge branch 'master' into renaming-talk 2017-07-26 15:17:19 -04:00
Chi Vinh Le b00435bfe3 Click on flagged user shows correct drawer 2017-07-26 18:43:10 +07:00
Kim Gardner 772e68f72e Merge branch 'master' into fix-vc 2017-07-25 14:26:04 -04:00
Chi Vinh Le 8ea8bb521a Merge branch 'event-emitter' of ssh://github.com/coralproject/talk into event-emitter 2017-07-26 00:06:20 +07:00
Belen Curcio 48dadd8571 Viewing Options for mobile 2017-07-25 14:00:30 -03:00
Chi Vinh Le 1473c778a5 Refactor listener 2017-07-25 23:26:23 +07:00
Belén Curcio a7adf3469d Merge branch 'master' into event-emitter 2017-07-25 13:04:08 -03:00
Chi Vinh Le 8ecf55610c More fetchMore events and more data for graphql events 2017-07-25 22:28:28 +07:00
Kim Gardner 589f5129c9 Merge branch 'master' into renaming-talk 2017-07-25 10:25:00 -04:00
Chi Vinh Le d4bf5fd423 Add subscription data events 2017-07-25 21:20:04 +07:00
Chi Vinh Le ceb83834a7 Remove subscribeToMore Event because it's incomplete 2017-07-25 21:19:42 +07:00
Kim Gardner 788a35d9bb Merge branch 'master' into commentsid 2017-07-25 10:12:23 -04:00
Chi Vinh Le 3c2229f3a7 Remove redundant networkStatus 2017-07-25 20:48:26 +07:00
Chi Vinh Le fe9d0eb8e2 Merge branch 'event-emitter' of ssh://github.com/coralproject/talk into event-emitter 2017-07-25 20:45:03 +07:00
Chi Vinh Le 45a2e2a8a3 Activate wildcard matching 2017-07-25 20:40:51 +07:00
Chi Vinh Le ef759e068b Adapt query helpers 2017-07-25 19:14:03 +07:00
Chi Vinh Le f10d1a9f0d Adapt auto scroll when loading a permalinked comment 2017-07-25 19:11:11 +07:00
Chi Vinh Le b4244b8671 More integration with the introspection query result
- Auto generate introspection on any change when using  `dev-start`
- Port client to use introspection matcher
2017-07-25 16:51:41 +07:00
Belen Curcio 36df7cb784 Extended Asset with comment 2017-07-24 16:31:24 -03:00
Kim Gardner 6383abd445 Merge branch 'master' into renaming-talk 2017-07-23 21:03:38 -04:00
Kim Gardner 661354998f Merge branch 'master' into event-emitter 2017-07-22 18:54:35 -04:00
Kim Gardner ee220ca936 Merge branch 'master' into long-title 2017-07-21 21:13:24 -04:00
Belen Curcio 25bccde40f fix 2017-07-21 16:08:18 -03:00
Belen Curcio 6343a0d621 Adding tooltip to badges too 2017-07-21 16:01:43 -03:00
Chi Vinh Le 1db61941ed Comment WithEmit 2017-07-22 00:10:45 +07:00
Chi Vinh Le 7b1c0dfbaa Docs & stuff 2017-07-22 00:05:36 +07:00