Commit Graph
6527 Commits
Author SHA1 Message Date
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
Kim Gardner 916596fe53 Merge branch 'master' into Issue-1024-forgot-password-flow 2017-10-06 15:36:38 +01:00
Kiwi 787f11118c Merge pull request #1059 from Rishabh04-02/master
displaying time in X minutes Y seconds
2017-10-06 14:38:20 +02:00
Kiwi cca0a6df71 Merge branch 'master' into master 2017-10-06 13:43:21 +02:00
Kim Gardner 596cd57274 Merge pull request #1065 from amorimgustavo/patch-1
Update pt_BR.yml
2017-10-06 12:14:17 +01:00
Kim Gardner b02ccd792c Merge branch 'master' into patch-1 2017-10-06 12:09:41 +01:00
Kiwi ad5a6c539a Merge branch 'master' into master 2017-10-06 12:04:42 +02: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
Wyatt Johnson 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
amorimgustavo 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 Gardner ba51645c87 Merge branch 'master' into slackbot 2017-10-05 17:08:17 +01:00
Kim Gardner bc0a188c57 Merge branch 'master' into master 2017-10-05 17:06:41 +01:00
Kim Gardner f497fdb277 Merge pull request #1056 from tylerbrewer2/fix-nav-width
fix admin navigation width
2017-10-05 17:06:17 +01:00
Kim Gardner a677c698bf Merge branch 'master' into master 2017-10-05 16:53:52 +01:00
Kim Gardner 73b4cfd2c4 Merge branch 'master' into slackbot 2017-10-05 16:53:43 +01:00
Kim Gardner 5f758d3437 Merge branch 'master' into fix-nav-width 2017-10-05 16:53:02 +01:00
Kim Gardner e8808f9232 Merge pull request #1061 from coralproject/clean-up-readme
Clean up README
2017-10-05 16:52:30 +01:00
Wyatt Johnson 6713397d02 Merge branch 'master' into clean-up-readme 2017-10-05 08:39:47 -06:00
Kim Gardner 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-wil 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 Gardner f330c385e5 Clean up README 2017-10-05 12:29:27 +01:00
Belén Curcio 474a3a12ef Merge branch 'master' into master 2017-10-05 07:34:49 -03:00
Belén Curcio 9b9e9c0292 Merge branch 'master' into fix-nav-width 2017-10-05 07:34:04 -03:00
Kim Gardner 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 Curcio c72dfdddf3 Merge branch 'master' into max-resize-other-box 2017-10-05 07:25:09 -03:00
Kim Gardner 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 Gardner 57b7829189 Merge pull request #1054 from PepeFranco/patch-2
Updated running-advanced-configuration.md
2017-10-04 23:40:50 +01:00
Jose Franco 551ac9dd90 Update running-advanced-configuration.md 2017-10-04 17:31:48 -05:00
Wyatt Johnson 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
Kiwi 197d94ffb1 Merge pull request #1004 from coralproject/jest-unit-test
Introduce Jest Unit Testing Framework
2017-10-04 18:22:09 +02:00
Kiwi d23d3be4ef Merge branch 'master' into jest-unit-test 2017-10-04 13:13:09 +02:00
Kiwi 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 Johnson 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 Johnson d75257a832 Revert "Revert "Remove .babelrc from plugin"" 2017-10-03 14:55:20 -06:00
Wyatt Johnson 074fbca231 Revert "Revert "Es6 modules + tree shaking"" 2017-10-03 14:54:08 -06:00
Wyatt Johnson 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 Johnson b5ab829f9b Revert "Es6 modules + tree shaking" 2017-10-03 14:36:36 -06:00
Wyatt Johnson 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 Johnson c6526a71ba Revert "Remove .babelrc from plugin" 2017-10-03 14:21:55 -06:00
Wyatt Johnson 3060f5097f Merge pull request #1006 from coralproject/featured-permission-fix
Fixes Featured Tag Permissions
2017-10-03 14:20:30 -06:00
Wyatt Johnson 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