wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-04 13:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,527 Commits 10 Branches 125 Tags
efdf7a6b25a11704b93052e4d324b4d82b943fae
Commit Graph
6527 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Janeiro efdf7a6b25 Handle IgnoreUser mutation errors 
We now check if the IgnoreUser mutation returned an error before
updating the apollo store. If the mutation returns an error we keep
the store as it is, otherwise the user is added to the ignore list.
 2017-10-07 23:02:33 +01:00
Daniel Janeiro 7eaad1541b Implement cannot ignore staff in users service 
`UsersService.ignoreUsers` now checks if any user provided is a staff
member. In case it is it throws a ErrCannotIgnoreStaff error.
 2017-10-07 23:02:25 +01:00
Daniel Janeiro 0c7b35ffde Add cannot ignore staff error 2017-10-07 21:51:58 +01:00
KiwiandGitHub 787f11118c Merge pull request #1059 from Rishabh04-02/master 
displaying time in X minutes Y seconds
 2017-10-06 14:38:20 +02:00
KiwiandGitHub cca0a6df71 Merge branch 'master' into master 2017-10-06 13:43:21 +02:00
Kim GardnerandGitHub 596cd57274 Merge pull request #1065 from amorimgustavo/patch-1 
Update pt_BR.yml
 2017-10-06 12:14:17 +01:00
Kim GardnerandGitHub b02ccd792c Merge branch 'master' into patch-1 2017-10-06 12:09:41 +01:00
KiwiandGitHub ad5a6c539a Merge branch 'master' into master 2017-10-06 12:04:42 +02:00
Wyatt JohnsonandGitHub 1b33b62af0 Merge pull request #1057 from vickychijwani/slackbot 
Slack notifications plugin for new comments
 2017-10-05 15:27:04 -06:00
Vicky Chijwani bf0901e77f Wrap Slack call in process.nextTick() to avoid blocking comment creation. 2017-10-06 02:17:45 +05:30
amorimgustavoandGitHub f164ad8013 Update pt_BR.yml 
Hello Folks,

Just edited some (several actually :) messages in your pt_BR.yml for your consideration.

You may consider using:

- "Banido" instead of "proibido"
- "Perfil" or "Usuario" instead of "Bio"
- "Opinião" instead of "Feedback"
- "Denunciar" instead of "Reportar"
- "Usuários(as)" instead of "Comentaristas"
- "Listas" instead of "Hilos" or "Filas"
- "Conversas" instead of "Histórias"

Hope you like those suggestions.

Cheers.
Gustavo
 2017-10-05 17:10:42 -03:00
Rishabh04-02 f1bad9e8f2 modifications - displaying time 
modifications in displaying like X minutes Y seconds
 2017-10-05 23:07:51 +05:30
Kim GardnerandGitHub ba51645c87 Merge branch 'master' into slackbot 2017-10-05 17:08:17 +01:00
Kim GardnerandGitHub bc0a188c57 Merge branch 'master' into master 2017-10-05 17:06:41 +01:00
Kim GardnerandGitHub f497fdb277 Merge pull request #1056 from tylerbrewer2/fix-nav-width 
fix admin navigation width
 2017-10-05 17:06:17 +01:00
Kim GardnerandGitHub a677c698bf Merge branch 'master' into master 2017-10-05 16:53:52 +01:00
Kim GardnerandGitHub 73b4cfd2c4 Merge branch 'master' into slackbot 2017-10-05 16:53:43 +01:00
Kim GardnerandGitHub 5f758d3437 Merge branch 'master' into fix-nav-width 2017-10-05 16:53:02 +01:00
Kim GardnerandGitHub e8808f9232 Merge pull request #1061 from coralproject/clean-up-readme 
Clean up README
 2017-10-05 16:52:30 +01:00
Wyatt JohnsonandGitHub 6713397d02 Merge branch 'master' into clean-up-readme 2017-10-05 08:39:47 -06:00
Kim GardnerandGitHub 6259c1869d Merge pull request #1062 from dusty-wil/master 
#1043 - Better error message for 1 character comments
 2017-10-05 14:43:24 +01:00
dusty-wilandGitHub 1ad942f06c Merge branch 'master' into master 2017-10-05 08:46:58 -04:00
Dusty Williams 1510ade47a revised error message for comments less than two characters in length - dmw 2017-10-05 08:33:29 -04:00
Kim GardnerandGitHub f330c385e5 Clean up README 2017-10-05 12:29:27 +01:00
Belén CurcioandGitHub 474a3a12ef Merge branch 'master' into master 2017-10-05 07:34:49 -03:00
Belén CurcioandGitHub 9b9e9c0292 Merge branch 'master' into fix-nav-width 2017-10-05 07:34:04 -03:00
Kim GardnerandGitHub 34292f467d Merge pull request #1052 from lancekruegger/max-resize-other-box 
Add a max-width to flag-reason text box to prevent cutoff
 2017-10-05 11:30:33 +01:00
Belén CurcioandGitHub c72dfdddf3 Merge branch 'master' into max-resize-other-box 2017-10-05 07:25:09 -03:00
Kim GardnerandGitHub ec74262089 Merge branch 'master' into fix-nav-width 2017-10-05 10:53:43 +01:00
Rishabh04-02 b3486ce614 displaying time in X minutes Y seconds 2017-10-05 10:48:12 +05:30
tylerbrewer2 85f9000a64 fix admin navigation width 2017-10-04 20:22:39 -04:00
Vicky Chijwani 95580f5ffe Add Slack notifications plugin for new comments. 2017-10-05 05:32:37 +05:30
Kim GardnerandGitHub 57b7829189 Merge pull request #1054 from PepeFranco/patch-2 
Updated running-advanced-configuration.md
 2017-10-04 23:40:50 +01:00
Jose FrancoandGitHub 551ac9dd90 Update running-advanced-configuration.md 2017-10-04 17:31:48 -05:00
Wyatt JohnsonandGitHub 2568f65fe5 Merge pull request #1053 from PepeFranco/defaultLanguage 
Added env variable TALK_DEFAULT_LAN
 2017-10-04 15:27:45 -06:00
PepeFranco 8d6f79ab79 Fixed typo from LAN to LANG 2017-10-04 16:16:07 -05:00
PepeFranco 841ab53ea7 Added env variable TALK_DEFAULT_LAN 2017-10-04 15:42:02 -05:00
Lance Ruegger 5147ca6b86 Add a max-width to the flag-reason text box to prevent cutoff 2017-10-04 11:04:47 -07:00
KiwiandGitHub 197d94ffb1 Merge pull request #1004 from coralproject/jest-unit-test 
Introduce Jest Unit Testing Framework
 2017-10-04 18:22:09 +02:00
KiwiandGitHub d23d3be4ef Merge branch 'master' into jest-unit-test 2017-10-04 13:13:09 +02:00
KiwiandGitHub ff9ae03522 Merge pull request #1009 from coralproject/revert-1008-revert-1002-es6-modules-tree-shaking 
Es6 modules + tree shaking
 2017-10-04 13:12:53 +02:00
Wyatt JohnsonandGitHub a50c16c00f Merge pull request #1010 from coralproject/revert-1007-revert-1005-rm-babelrc-subscriber 
Revert "Revert "Remove .babelrc from plugin""
 2017-10-03 14:56:22 -06:00
Wyatt JohnsonandGitHub d75257a832 Revert "Revert "Remove .babelrc from plugin"" 2017-10-03 14:55:20 -06:00
Wyatt JohnsonandGitHub 074fbca231 Revert "Revert "Es6 modules + tree shaking"" 2017-10-03 14:54:08 -06:00
Wyatt JohnsonandGitHub 8a02618d8a Merge pull request #1008 from coralproject/revert-1002-es6-modules-tree-shaking 
Revert "Es6 modules + tree shaking"
v3.6.1 		2017-10-03 14:43:09 -06:00
Wyatt JohnsonandGitHub b5ab829f9b Revert "Es6 modules + tree shaking" 2017-10-03 14:36:36 -06:00
Wyatt JohnsonandGitHub 4bfc20b782 Merge pull request #1007 from coralproject/revert-1005-rm-babelrc-subscriber 
Revert "Remove .babelrc from plugin"
 2017-10-03 14:26:46 -06:00
Wyatt JohnsonandGitHub c6526a71ba Revert "Remove .babelrc from plugin" 2017-10-03 14:21:55 -06:00
Wyatt JohnsonandGitHub 3060f5097f Merge pull request #1006 from coralproject/featured-permission-fix 
Fixes Featured Tag Permissions
 2017-10-03 14:20:30 -06:00
Wyatt JohnsonandGitHub b11783d54f Fixes Featured Tag Permissions 
- When a comment is created, there is a possibility of injecting a tag into the payload, this removes that permission error
 2017-10-03 14:15:42 -06:00