wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-30 12:40:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,549 Commits 10 Branches 125 Tags
3c7e0462f5454bba5e9afbf8b7bd310d669f6dc0
Commit Graph
6549 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim GardnerandGitHub 3c7e0462f5 Merge branch 'master' into cannot-ignore-staff 2017-10-10 13:06:54 +01:00
Kim GardnerandGitHub 15f07b1360 Merge pull request #1068 from tylerbrewer2/fix-shortcut-icon 
fix hidden shortcut icon
 2017-10-10 13:05:20 +01:00
Tyler BrewerandGitHub 48c291a9c3 Merge branch 'master' into fix-shortcut-icon 2017-10-09 11:01:26 -04:00
KiwiandGitHub 77d30bdbc1 Merge pull request #1066 from gerardogalvez/moderate-shortcuts 
Add moderator shortcuts to open search and switch between queues.
 2017-10-09 08:59:03 +02:00
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
Gerardo Galvez e4ff48ea88 Merge branch 'moderate-shortcuts' of https://github.com/gerardogalvez/talk into moderate-shortcuts 2017-10-06 20:20:48 -05:00
Gerardo Galvez cbd7337dbc Add spanish translations and cleaner way to get the activeTabIndex 2017-10-06 20:19:30 -05:00
Belén CurcioandGitHub c7bf3c1a3c Merge branch 'master' into moderate-shortcuts 2017-10-06 18:07:30 -03:00
Tyler BrewerandGitHub bb78ba9b0b Merge branch 'master' into fix-shortcut-icon 2017-10-06 16:09:59 -04:00
KiwiandGitHub 62834ae412 Merge pull request #1067 from lancekruegger/Issue-1024-forgot-password-flow 
Update forgot password flow to match site styling
 2017-10-06 21:43:14 +02:00
David ErwinandGitHub 0c62ff0f9f Merge branch 'master' into Issue-1024-forgot-password-flow 2017-10-06 15:38:26 -04:00
KiwiandGitHub 380f20d525 Merge pull request #1072 from kamos1/fix-1037 
fix issue 1037
 2017-10-06 21:35:45 +02:00
Lance Ruegger 252ec8f6ac Change full constructor to use class property, fix typo in handleChangeEmail, pass value to TextField to ensure they stay in sync. 2017-10-06 12:26:03 -07:00
kamos1 e95e0381c2 remove removeNewLine and add .trim to length variable 2017-10-06 13:25:32 -06:00
kamos1 8ab31d7009 add trim to prevent empty spaces, tabs and other whitespace characters 2017-10-06 13:19:37 -06:00
kamos1 57f8a64cf4 fix issue 1037 2017-10-06 12:24:58 -06:00
Kim GardnerandGitHub 387316849a Merge branch 'master' into moderate-shortcuts 2017-10-06 17:34:46 +01:00
Kim GardnerandGitHub 26c1d22ec3 Merge branch 'master' into fix-shortcut-icon 2017-10-06 17:30:28 +01:00
Kim GardnerandGitHub 916596fe53 Merge branch 'master' into Issue-1024-forgot-password-flow 2017-10-06 15:36:38 +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
tylerbrewer2 a4591ecb55 fix hidden shortcut icon 2017-10-05 20:51:54 -04:00
Lance Ruegger 6c95502b4e Change DOM input to coral-ui TextField to inherit styling, add prop-types validation, convert from using ref to using state. 2017-10-05 17:36:38 -07:00
Gerardo GálvezandGitHub 931b5ad3ac Merge branch 'master' into moderate-shortcuts 2017-10-05 17:18:18 -05:00
Gerardo Galvez c0bb5e5cb2 Add moderator shortcuts to open search and switch between queues. 2017-10-05 16:57:46 -05: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