Commit Graph

  • 00f98520f7 Merge branch 'master' into flagged-count Kim Gardner 2017-09-19 09:12:15 +01:00
  • 0dfcbc9927 Merge branch 'master' into all-comments-translation Kim Gardner 2017-09-19 09:11:44 +01:00
  • a68e1c9c0b Merge pull request #969 from coralproject/helmet-config Kim Gardner 2017-09-19 09:11:14 +01:00
  • 75635aff2b Merge branch 'flagged-count' of github.com:coralproject/talk into flagged-count Belen Curcio 2017-09-18 15:52:06 -03:00
  • ab2e036047 withFragments and parent withQuery added Belen Curcio 2017-09-18 15:49:23 -03:00
  • 52c1989780 Expose Helmet configuration Wyatt Johnson 2017-09-18 11:57:57 -06:00
  • abd458ab82 Merge branch 'master' into all-comments-translation Kiwi 2017-09-18 19:48:09 +02:00
  • 41afe9fae7 Replace hard-coded string on all comments tab with translation Chi Vinh Le 2017-09-19 00:41:38 +07:00
  • e6fa0a6d12 Merge pull request #950 from coralproject/fix-notify-bugs Kim Gardner 2017-09-18 18:38:09 +01:00
  • a0fb6030ca Merge branch 'master' into fix-notify-bugs Belén Curcio 2017-09-18 14:27:21 -03:00
  • c95d0e45f8 Merge pull request #952 from coralproject/instream-ban Kim Gardner 2017-09-18 18:26:59 +01:00
  • 7144f171ef Merge branch 'master' into fix-notify-bugs Belén Curcio 2017-09-18 14:20:33 -03:00
  • 23e1b56c6e Merge branch 'master' into instream-ban Kim Gardner 2017-09-18 18:19:53 +01:00
  • 9b999c6249 Merge pull request #967 from coralproject/fix-safari-rendering-issues Wyatt Johnson 2017-09-18 11:19:32 -06:00
  • 7a81a125f5 Merge branch 'master' into fix-safari-rendering-issues Kiwi 2017-09-18 19:14:07 +02:00
  • 79cdd65e30 Merge branch 'master' into flagged-count Belén Curcio 2017-09-18 14:12:23 -03:00
  • ed22bc34fc Add a comment Chi Vinh Le 2017-09-19 00:11:49 +07:00
  • d7ea88c367 matching master Belen Curcio 2017-09-18 14:10:44 -03:00
  • afec9932f0 Merge branch 'master' of github.com:coralproject/talk into instream-ban Belen Curcio 2017-09-18 14:08:41 -03:00
  • 2c297d7c2f Promote modqueue comment into own layer to fix safari issues Chi Vinh Le 2017-09-19 00:08:09 +07:00
  • 2814070808 Merge pull request #955 from coralproject/static-url Kim Gardner 2017-09-18 18:02:40 +01:00
  • 6ed6726daf Merge branch 'master' into static-url Kim Gardner 2017-09-18 17:57:49 +01:00
  • 21936ae467 Merge pull request #963 from coralproject/react-linting-rules Kim Gardner 2017-09-18 17:57:17 +01:00
  • 613a7f7073 Merge branch 'master' into static-url Kim Gardner 2017-09-18 17:56:38 +01:00
  • 9258347886 Merge branch 'master' into instream-ban Kim Gardner 2017-09-18 17:56:15 +01:00
  • 959193f8b5 Merge branch 'master' into flagged-count Belén Curcio 2017-09-18 13:19:41 -03:00
  • 212c6cd0ce Merge branch 'master' into react-linting-rules Wyatt Johnson 2017-09-18 10:02:49 -06:00
  • 5f3931f34b Merge pull request #966 from coralproject/toxic-comment-group-id Wyatt Johnson 2017-09-18 09:49:22 -06:00
  • aa3327945e Styles and copy Belen Curcio 2017-09-18 12:42:21 -03:00
  • c8dc5d4cd9 Turn toxic comment group_id into a constant Chi Vinh Le 2017-09-18 22:39:30 +07:00
  • 11c46439a2 corrected view error Wyatt Johnson 2017-09-18 09:19:52 -06:00
  • a07d661655 Adding CountBadge and flaggedUsernamesCount Belen Curcio 2017-09-18 11:53:52 -03:00
  • 24391de61d userCount Belen Curcio 2017-09-18 11:06:31 -03:00
  • 33822ff6c0 More linting error fixes Chi Vinh Le 2017-09-18 20:38:32 +07:00
  • 5d153e764d Linting Belen Curcio 2017-09-18 10:30:39 -03:00
  • 597d67f5d2 Actions renamed Belen Curcio 2017-09-18 10:28:02 -03:00
  • 100dd519ee Replacing excludeIf Belen Curcio 2017-09-18 10:12:28 -03:00
  • eb03d62e51 Merge branch 'instream-ban' of github.com:coralproject/talk into instream-ban Belen Curcio 2017-09-18 10:05:12 -03:00
  • 8bfc7e942c Renaming Belen Curcio 2017-09-18 10:04:39 -03:00
  • 1a349eb0cd Turn on prop-types linter Chi Vinh Le 2017-09-18 19:03:07 +07:00
  • f19b333537 Fix some linter warnings Chi Vinh Le 2017-09-18 18:56:52 +07:00
  • c6c2d545f8 Merge branch 'master' into static-url Kim Gardner 2017-09-18 12:55:28 +01:00
  • ebe9945492 Merge branch 'master' into instream-ban Kim Gardner 2017-09-18 12:54:54 +01:00
  • c6403b2da3 Merge branch 'master' into fix-notify-bugs Kim Gardner 2017-09-18 12:54:46 +01:00
  • cd100a23cb Merge pull request #932 from pdehaan/eslint-react Wyatt Johnson 2017-09-15 17:29:28 -06:00
  • 25761f9e61 Merge branch 'master' into eslint-react Wyatt Johnson 2017-09-15 17:22:51 -06:00
  • 1a76a83806 Merge pull request #959 from coralproject/view-context-no-tombstone Wyatt Johnson 2017-09-15 17:20:29 -06:00
  • 55ebd1df8e Merge branch 'master' into view-context-no-tombstone Wyatt Johnson 2017-09-15 17:16:07 -06:00
  • c427691bef Merge pull request #958 from coralproject/detect-n-display-stream-errors Wyatt Johnson 2017-09-15 17:15:34 -06:00
  • 93afd793cb Merge branch 'master' into detect-n-display-stream-errors Wyatt Johnson 2017-09-15 17:10:46 -06:00
  • 35232cf015 Merge pull request #957 from coralproject/fix-config Wyatt Johnson 2017-09-15 16:56:24 -06:00
  • f864ebf2e3 Merge branch 'master' into fix-config Wyatt Johnson 2017-09-15 15:56:46 -06:00
  • a9cc78b61d Merge pull request #943 from coralproject/story/150848457 Wyatt Johnson 2017-09-15 15:55:35 -06:00
  • 2c3a52b48c Merge branch 'master' into story/150848457 Wyatt Johnson 2017-09-15 15:49:30 -06:00
  • 0b1a75726c Merge pull request #956 from coralproject/story/150636425 Wyatt Johnson 2017-09-15 15:49:11 -06:00
  • 384c126d9e added docs Wyatt Johnson 2017-09-15 15:29:20 -06:00
  • f97094177a revamped configuration for moderation phases Wyatt Johnson 2017-09-15 14:23:18 -06:00
  • 4739f86739 Merge branch 'master' into eslint-react Kiwi 2017-09-15 20:43:49 +02:00
  • f386909748 Don't show tombstone during "view context" Chi Vinh Le 2017-09-16 01:36:15 +07:00
  • aa4f781d25 Better error detection Chi Vinh Le 2017-09-16 01:27:50 +07:00
  • 4567b4565f Detect and display stream errors Chi Vinh Le 2017-09-16 01:19:59 +07:00
  • 3133922100 Fix config parsing bug Chi Vinh Le 2017-09-16 01:02:19 +07:00
  • e9bd5e4476 Merge branch 'master' into story/150848457 Kiwi 2017-09-15 19:53:00 +02:00
  • f2e06d6d27 Merge branch 'master' into story/150636425 Wyatt Johnson 2017-09-15 09:57:57 -06:00
  • e31cdebc12 Make it appear in reported queue Chi Vinh Le 2017-09-15 22:52:19 +07:00
  • e03e7de82f Merge branch 'master' into static-url Wyatt Johnson 2017-09-15 09:46:05 -06:00
  • c7b755d2ff Merge pull request #954 from coralproject/url-fix Wyatt Johnson 2017-09-15 08:40:55 -06:00
  • dc7013187d Merge branch 'master' into story/150636425 Chi Vinh Le 2017-09-15 19:11:31 +07:00
  • 20c4148301 Close and styling Belen Curcio 2017-09-14 17:37:47 -03:00
  • ba24af015c Merge branch 'instream-ban' of github.com:coralproject/talk into instream-ban Belen Curcio 2017-09-14 17:37:31 -03:00
  • 94456674df fixed embed url link Wyatt Johnson 2017-09-14 14:32:16 -06:00
  • 5231c2d627 Removing perms mods Belen Curcio 2017-09-14 17:28:54 -03:00
  • f74e8dda16 added support for changing the static url Wyatt Johnson 2017-09-14 14:27:45 -06:00
  • 825d53afcd Merge branch 'master' into eslint-react Wyatt Johnson 2017-09-14 13:28:53 -06:00
  • 029877080d Merge branch 'master' into fix-notify-bugs Wyatt Johnson 2017-09-14 13:28:34 -06:00
  • 83f10a4863 Merge branch 'master' into story/150848457 Wyatt Johnson 2017-09-14 13:27:53 -06:00
  • d820d2d2c3 moved support for deepReplyCount to seperate field Wyatt Johnson 2017-09-14 13:08:01 -06:00
  • a6443f2bcc Merge branch 'master' into instream-ban Belén Curcio 2017-09-14 13:05:58 -03:00
  • 7ace5b369a Merge pull request #951 from coralproject/update-readme Kim Gardner 2017-09-14 16:49:40 +01:00
  • cf66c10262 Update README Kim Gardner 2017-09-14 16:45:19 +01:00
  • 99296ebe69 Merge branch 'master' into fix-notify-bugs Kiwi 2017-09-14 17:25:50 +02:00
  • 7600ce8d26 Fix error notification bugs Chi Vinh Le 2017-09-14 22:22:16 +07:00
  • 26256b979e Merge branch 'master' into story/150848457 Kim Gardner 2017-09-14 16:20:20 +01:00
  • 0113f02994 Merge pull request #944 from coralproject/new-regexp-highlighter Kim Gardner 2017-09-14 16:20:06 +01:00
  • b3eb3361bb Merge branch 'master' into new-regexp-highlighter Wyatt Johnson 2017-09-14 08:47:40 -06:00
  • fce65e616d Merge pull request #949 from coralproject/fix-moderator-rest-permission Wyatt Johnson 2017-09-14 08:47:28 -06:00
  • 6a4a0b7f6b Merge branch 'master' into eslint-react Wyatt Johnson 2017-09-14 08:33:42 -06:00
  • c41ab58109 Allow Moderator to have read access on assets and settings Chi Vinh Le 2017-09-14 21:11:40 +07:00
  • 837a586234 Ban User confirmation box Belen Curcio 2017-09-14 09:26:33 -03:00
  • 2facde3894 Adding dialog Belen Curcio 2017-09-14 09:14:15 -03:00
  • 76a6a0e82b Remove natural package Chi Vinh Le 2017-09-14 18:10:24 +07:00
  • bea25f2a11 Merge branch 'new-regexp-highlighter' of ssh://github.com/coralproject/talk into new-regexp-highlighter Chi Vinh Le 2017-09-14 17:40:01 +07:00
  • ad361413c7 Reimplement wordlist on server using same regexp solution Chi Vinh Le 2017-09-14 17:36:04 +07:00
  • cf61d9e2ca Merge branch 'master' into story/150848457 Kim Gardner 2017-09-14 10:07:04 +01:00
  • 77ef9ff111 Merge branch 'master' into new-regexp-highlighter Kim Gardner 2017-09-14 10:06:43 +01:00
  • c8cc5e6a34 Merge pull request #948 from coralproject/docs-update Kim Gardner 2017-09-14 09:16:17 +01:00
  • bdd5e47427 Icon, translations Belen Curcio 2017-09-13 17:38:04 -03:00
  • 1574e08197 fixes #947 Wyatt Johnson 2017-09-13 12:02:20 -06:00
  • abc651c55d Add some optimizations Chi Vinh Le 2017-09-14 00:48:19 +07:00
  • fa335564ed Generate RegExp from phrases Chi Vinh Le 2017-09-14 00:10:29 +07:00