wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-13 17:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 12cb59ce30 Merge branch 'master' into i18n-refactor gaba 2017-05-18 15:44:14 -07:00
  • f35a9ec8cd Merge pull request #602 from coralproject/content-type-fix Kim Gardner 2017-05-18 18:40:35 -04:00
  • 1a7ad410f5 Loads timeago translation when loading translations. gaba 2017-05-18 15:38:53 -07:00
  • 25230f2e9d added fix for chrome + content type negotiation Wyatt Johnson 2017-05-18 16:30:28 -06:00
  • 3ca22bd101 Fix translation keys. gaba 2017-05-18 15:14:37 -07:00
  • f29df23c07 Merge pull request #601 from coralproject/read-only-inputs Kim Gardner 2017-05-18 17:21:12 -04:00
  • b3e494d279 Merge branch 'master' into read-only-inputs Kim Gardner 2017-05-18 17:14:48 -04:00
  • 13376504b5 Merge pull request #598 from gobengo/edit-comment-settings Kim Gardner 2017-05-18 17:14:29 -04:00
  • 12ec058588 Merge branch 'master' into edit-comment-settings Kim Gardner 2017-05-18 17:07:37 -04:00
  • 5cbe9029aa Merge pull request #596 from gobengo/fix-ignore-user Kim Gardner 2017-05-18 16:43:46 -04:00
  • 6deee7cb80 add a perms utils file riley 2017-05-18 14:28:43 -06:00
  • c772cffc92 handle no-interaction input the correct way Riley Davis 2017-05-18 13:51:48 -06:00
  • 89b7918e41 Tiny renaming Chi Vinh Le 2017-05-19 02:29:59 +07:00
  • b521934ee2 Remove unneeded refetch Chi Vinh Le 2017-05-19 02:24:47 +07:00
  • 061c18670b Merge branch 'master' into suspend-user Chi Vinh Le 2017-05-19 02:19:24 +07:00
  • 0040bc4c01 Remove remaining debug msgs Chi Vinh Le 2017-05-19 02:12:27 +07:00
  • 0588a8ab66 Use async / await :-) Chi Vinh Le 2017-05-19 02:07:38 +07:00
  • 859a0b1fbe Make until arg required Chi Vinh Le 2017-05-19 02:03:36 +07:00
  • d995cdde07 Make email message required Chi Vinh Le 2017-05-19 02:01:47 +07:00
  • f641a3ec40 Complete suspend user implementation Chi Vinh Le 2017-05-19 01:52:03 +07:00
  • e80e79f267 Merge branch 'master' into edit-comment-settings Kim Gardner 2017-05-18 14:23:14 -04:00
  • ff75b9474a merge master riley 2017-05-18 12:18:00 -06:00
  • 056ba9a04c do the same thing for the Drawer riley 2017-05-18 12:11:11 -06:00
  • d98ce38bf5 show config tab to admins. hide menu items from users that can't access admin riley 2017-05-18 12:06:07 -06:00
  • 1d322d8c70 Merge branch 'master' into fix-ignore-user Benjamin Goering 2017-05-18 10:50:00 -07:00
  • aaa2da6c23 Stream container refetch then setCommentCountCache to asset.commentCount instead of silly zero Benjamin Goering 2017-05-18 10:43:38 -07:00
  • 5a272413e6 Merge pull request #599 from coralproject/gzip Wyatt Johnson 2017-05-18 11:34:05 -06:00
  • 4dc83aaf63 added middleware wrap Wyatt Johnson 2017-05-18 11:27:28 -06:00
  • 12713dae86 Removed unused assets Wyatt Johnson 2017-05-18 11:18:08 -06:00
  • 555c593059 Added gzip compression to bundle assets Wyatt Johnson 2017-05-18 11:08:46 -06:00
  • fb33eefe8e trivial changes requested by review Benjamin Goering 2017-05-18 08:19:52 -07:00
  • cfc6d4bfea Merge branch 'fix-ignore-user' of github.com:gobengo/talk into fix-ignore-user Benjamin Goering 2017-05-18 08:12:40 -07:00
  • 6bbeee3a6b StopIgnoringUser does not refetch EmbedQuery Benjamin Goering 2017-05-18 08:11:39 -07:00
  • 340d3cea62 contains/Stream setCommentCountCache waits for refetch promise Benjamin Goering 2017-05-18 08:10:20 -07:00
  • e8e9dbe3ca Merge branch 'master' into fix-ignore-user Kim Gardner 2017-05-18 09:49:54 -04:00
  • 132b0a854d linting Belen Curcio 2017-05-18 00:22:39 -03:00
  • 17e7b28688 Fully working best tag Belen Curcio 2017-05-18 00:21:08 -03:00
  • b795368674 Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags Belen Curcio 2017-05-17 23:54:38 -03:00
  • f57fa7cb7b Update Cache Belen Curcio 2017-05-17 23:53:07 -03:00
  • 9e954f0ae3 Fix timeago with lang. gaba 2017-05-17 18:05:41 -07:00
  • cb45f0a8b3 Merge branch 'master' into edit-comment-settings Benjamin Goering 2017-05-17 15:46:14 -07:00
  • cb1a4ee1cc remove extraneous console.log Benjamin Goering 2017-05-17 15:40:32 -07:00
  • d93ad38dd1 Admins can change Edit Comment Window length in Moderation Settings Benjamin Goering 2017-05-17 15:39:19 -07:00
  • c4210db307 staff should not see moderate tag. translations riley 2017-05-17 16:10:02 -06:00
  • 3fc1029a93 do not require auth in the Header riley 2017-05-17 16:00:01 -06:00
  • 54abaeb587 wrap the not-authorized warning in a template Riley Davis 2017-05-17 15:47:41 -06:00
  • 4a97db3357 emma's copy Riley Davis 2017-05-17 15:41:49 -06:00
  • 88377b3180 do not show Config tab for non-admins Riley Davis 2017-05-17 15:37:13 -06:00
  • 0dfec6e619 Merge pull request #597 from coralproject/copy-button-should-work Kim Gardner 2017-05-17 17:35:08 -04:00
  • e343897526 user detail copy button regression Riley Davis 2017-05-17 15:11:00 -06:00
  • 294eb6c81d Merge branch 'master' into fix-ignore-user Benjamin Goering 2017-05-17 13:57:23 -07:00
  • 413eef8834 Merge pull request #564 from coralproject/user-detail-ui Kim Gardner 2017-05-17 16:41:00 -04:00
  • 9eac05c8fb Ignored user tombstones work again Benjamin Goering 2017-05-17 13:18:59 -07:00
  • 8d492ca4e9 Adds a few missing keys. gaba 2017-05-17 13:18:04 -07:00
  • 3aceb0dc38 Merge branch 'master' into i18n-refactor gaba 2017-05-17 12:59:24 -07:00
  • 5bd9bc992b Move i18n into a service gaba 2017-05-17 12:53:36 -07:00
  • 492b973206 Add 1 extra suspension minute Chi Vinh Le 2017-05-18 02:26:38 +07:00
  • 2bdf413b88 Integrate into embed stream Chi Vinh Le 2017-05-18 02:16:20 +07:00
  • 76e87f4c34 Move previous suspendUser feature to rejectUsername Chi Vinh Le 2017-05-17 23:43:16 +07:00
  • c66e3141e0 actually check permissions Riley Davis 2017-05-17 11:38:43 -06:00
  • a0f41bb19d show total comments and rejected % Riley Davis 2017-05-17 10:54:14 -06:00
  • 7a256bdd2b Merge branch 'master' into 142993479-tags Wyatt Johnson 2017-05-17 10:01:58 -06:00
  • 6664f73d2d Best tag working, only Optimistic Missing Belen Curcio 2017-05-17 11:57:51 -03:00
  • 056ff427a5 Merge branch 'master' into suspend-user Chi Vinh Le 2017-05-17 21:50:28 +07:00
  • fb0e89485c Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags Belen Curcio 2017-05-17 11:20:00 -03:00
  • b2f1707f17 Fully working offtopic Belen Curcio 2017-05-17 11:19:06 -03:00
  • 9db77360b4 removed unused errors Wyatt Johnson 2017-05-17 08:16:48 -06:00
  • 71c743dda7 Extend backend to support new suspend feature Chi Vinh Le 2017-05-17 19:58:43 +07:00
  • 9dc0693530 Linting Belen Curcio 2017-05-17 09:43:04 -03:00
  • 54eb078a13 Working offtopic tag Belen Curcio 2017-05-17 09:37:26 -03:00
  • 793f634959 Working tags Belen Curcio 2017-05-17 09:01:41 -03:00
  • fde4dee52f Resolver cleanup Wyatt Johnson 2017-05-16 17:26:34 -06:00
  • b49ace99eb add permission for EDIT_COMMENT riley 2017-05-16 16:38:30 -06:00
  • d081c0c5b5 remove context riley 2017-05-16 16:34:04 -06:00
  • 03ce044c53 merge master riley 2017-05-16 16:33:41 -06:00
  • 31647fb2f0 have function params in the correct order riley 2017-05-16 15:41:27 -06:00
  • f4b9191476 Added author_id to comment count query Wyatt Johnson 2017-05-16 14:19:40 -06:00
  • 4ca5c4bc09 Merge branch 'master' into user-detail-ui Riley Davis 2017-05-16 13:54:13 -06:00
  • c21e500e58 Merge pull request #593 from coralproject/readd-last-comment Kiwi 2017-05-17 01:35:07 +07:00
  • 7d858c7b3f Readd lastComment field to asset resolver Chi Vinh Le 2017-05-17 01:25:06 +07:00
  • c7e9fe3f5f update backend with the can() method riley 2017-05-16 10:50:09 -06:00
  • e90ce7f4c3 fixed merge issue Wyatt Johnson 2017-05-16 10:20:16 -06:00
  • 62e8e4c5c5 change how constants are exposed riley 2017-05-16 10:15:43 -06:00
  • 3e2ed222ed Merge branch 'trust-merge' into user-detail-ui Wyatt Johnson 2017-05-16 09:53:35 -06:00
  • 7896b3f33b merge master riley 2017-05-16 09:43:49 -06:00
  • 97121382c7 Merge branch 'master' into suspend-user Chi Vinh Le 2017-05-16 21:02:33 +07:00
  • e561819c8d Merge pull request #592 from coralproject/invalidate-old-data Belén Curcio 2017-05-16 08:57:32 -03:00
  • c7e0577708 Merge branch 'master' into invalidate-old-data Chi Vinh Le 2017-05-16 18:17:45 +07:00
  • 2ab8cc9481 Allow Apollo to invalidate old user data Chi Vinh Le 2017-05-16 18:05:07 +07:00
  • acdc00af18 Merge pull request #591 from coralproject/refetch-profile-only-after-login Kiwi 2017-05-16 18:12:54 +07:00
  • f9cf5fb744 Merge branch 'master' into refetch-profile-only-after-login Belén Curcio 2017-05-16 07:57:20 -03:00
  • e1b80c3317 Only refetch for login Chi Vinh Le 2017-05-16 17:50:17 +07:00
  • f37c1c3b5d Merge pull request #590 from coralproject/auth-login-fixes Belén Curcio 2017-05-16 07:42:32 -03:00
  • ec19618052 Readd login fixes Chi Vinh Le 2017-05-16 17:13:41 +07:00
  • 81f51b69ec Clear token before dispatching logout action Chi Vinh Le 2017-05-16 17:13:19 +07:00
  • 084bd6710f Merge pull request #589 from coralproject/fix Belén Curcio 2017-05-16 00:14:02 -03:00
  • df843a23dd updated loc Belen Curcio 2017-05-16 00:09:33 -03:00
  • 95e770aff8 Merge pull request #588 from coralproject/fix Kim Gardner 2017-05-15 22:57:30 -04:00
  • d3252b8c87 Done :) Belen Curcio 2017-05-15 23:47:29 -03:00
  • 1eada688fe Prettier Belen Curcio 2017-05-15 23:23:22 -03:00