Commit Graph

9934 Commits

Author SHA1 Message Date
Wyatt Johnson e39bcb11ba added comment 2018-05-24 14:02:02 -06:00
Wyatt Johnson a046162f9c karma -> karmaThresholds 2018-05-24 13:57:26 -06:00
Wyatt Johnson 8f51b07388 Merge branch 'master' into karma 2018-05-24 13:28:03 -06:00
Wyatt Johnson 45113f14c7 Merge pull request #1650 from coralproject/whitelisted-langs
Added support for forcing languages
2018-05-24 13:24:00 -06:00
Wyatt Johnson 0c35badd95 name changes 2018-05-24 12:58:55 -06:00
Wyatt Johnson 1c0bfdb89e Merge branch 'master' into whitelisted-langs 2018-05-24 12:38:22 -06:00
Wyatt Johnson 8f4846404a fixed default doc 2018-05-24 12:35:45 -06:00
Wyatt Johnson c642cc811c fix 2018-05-24 12:34:58 -06:00
Wyatt Johnson 945ab9a1b6 Added support for forcing languages 2018-05-24 12:32:06 -06:00
Wyatt Johnson 0c1e4873f8 fixed first time user 2018-05-24 10:11:49 -06:00
okbel f3d89e63d2 Merge branch 'karma' of github.com:coralproject/talk into karma
* 'karma' of github.com:coralproject/talk: (32 commits)
  fixed translations
  "Trust" flag to "Karma" and updated translations
  adjusted karma tooltip
  field renamed
  patches to reliability computation based on settings
  add from to import statement
  Remuve dupe "apply"
  Fix broken link to tokenusernotfound
  Make it so low threshold is included in karma calc
  Fix incorrect statement regarding GDPR
  simplified language negotiation
  Docs typo
  relying on ip
  req not properly passed
  German translations for the email notification plugins.
  Small modification
  doc patch
  fix for custom css
  fixes to csp policy
  disable by default
  ...
2018-05-24 13:09:13 -03:00
Wyatt Johnson 0835f3f321 fixed translations 2018-05-23 17:16:51 -06:00
Wyatt Johnson 9a73c6db59 "Trust" flag to "Karma" and updated translations 2018-05-23 16:18:22 -06:00
Wyatt Johnson 97416d421b adjusted karma tooltip 2018-05-23 16:18:22 -06:00
Wyatt Johnson f36b6e2cb6 field renamed 2018-05-23 16:18:22 -06:00
Wyatt Johnson 975448ec69 patches to reliability computation based on settings 2018-05-23 16:18:22 -06:00
Kim Gardner 921b85fba3 Merge branch 'master' into karma 2018-05-23 16:47:52 -04:00
Kim Gardner 9c7ed62cba Merge pull request #1644 from erikreyna/patch-1
add from to import statement
2018-05-23 16:47:02 -04:00
Wyatt Johnson b7a053c011 Merge branch 'master' into patch-1 2018-05-23 13:28:20 -06:00
Kim Gardner 6548df971c Merge branch 'master' into karma 2018-05-23 15:19:32 -04:00
Kim Gardner 27818d966d Merge pull request #1642 from babolivier/patch-1
[Doc] Fix incorrect statement regarding GDPR
2018-05-23 14:43:46 -04:00
Erik Reyna f7f6ed635c add from to import statement
from expected from import statement, thanks eslint
2018-05-23 14:24:11 -04:00
Wyatt Johnson 61c09f5818 Merge branch 'master' into patch-1 2018-05-23 12:17:05 -06:00
Wyatt Johnson def20a3b37 Merge pull request #1643 from smic1909/patch-1
Fix broken link to tokenusernotfound
2018-05-23 12:16:48 -06:00
Wyatt Johnson 4ae3e90422 Merge branch 'master' into patch-1 2018-05-23 12:09:44 -06:00
Wyatt Johnson 9539073eb8 Merge pull request #1633 from coralproject/csp
Content Security Policy + Nunjacks
2018-05-23 12:08:45 -06:00
Wyatt Johnson 422260607e Merge branch 'master' into csp 2018-05-23 11:53:24 -06:00
Wyatt Johnson a16c584880 Merge branch 'master' into patch-1 2018-05-23 11:25:14 -06:00
Wyatt Johnson 3fcc85139d Merge pull request #1641 from coralproject/locales
Locale Negotiation
2018-05-23 10:12:27 -06:00
okbel 17f76e85b0 changes 2018-05-23 13:07:34 -03:00
Brendan Abolivier a95d55b6da Remuve dupe "apply" 2018-05-23 10:05:21 +02:00
Simon 879865a4c1 Fix broken link to tokenusernotfound
Fix broken link to tokenusernotfound
2018-05-23 09:14:32 +02:00
Kim Gardner 8405bdf9bc Merge branch 'karma' of git+ssh://github.com/coralproject/talk into karma 2018-05-22 20:12:40 -04:00
Kim Gardner 8e24d4f5c6 Make it so low threshold is included in karma calc 2018-05-22 20:12:17 -04:00
Kim Gardner 9265d29ac0 Merge branch 'master' into karma 2018-05-22 19:00:12 -04:00
Brendan Abolivier 849fe37b9b Fix incorrect statement regarding GDPR
GDPR's reach doesn't depend on the person or business's location, but on whether this person or this business include european citizen in its target (which can be easy to state for a business, but not that much for an individual).
2018-05-22 23:25:12 +02:00
Wyatt Johnson 1a52ad5d97 Merge branch 'master' into locales 2018-05-22 14:42:43 -06:00
Wyatt Johnson b984af3e2e Merge pull request #1638 from coralproject/akismet-bug
Akismet Bug - Req not properly passed
2018-05-22 14:42:24 -06:00
Wyatt Johnson 10a786f84d simplified language negotiation 2018-05-22 14:21:32 -06:00
Kiwi 9b4455f7bd Merge branch 'master' into csp 2018-05-22 16:39:20 -03:00
Kim Gardner 3a12e776c3 Merge branch 'master' into akismet-bug 2018-05-22 15:01:50 -04:00
Kim Gardner 6667bbe01f Docs typo 2018-05-22 13:18:28 -04:00
Kim Gardner 583cb6566b Merge branch 'master' into karma 2018-05-22 12:54:09 -04:00
Kim Gardner f90e17c3e0 Merge pull request #1625 from coralproject/party-fixes
Displaying multiple external provider IDs
2018-05-22 12:52:08 -04:00
Kim Gardner 71b1259db6 Merge branch 'master' into akismet-bug 2018-05-22 12:21:53 -04:00
Kiwi a39b967164 Merge branch 'master' into party-fixes 2018-05-22 13:19:08 -03:00
okbel b411f3e059 relying on ip 2018-05-22 13:08:59 -03:00
okbel 1aed51468f req not properly passed 2018-05-22 12:40:21 -03:00
Kim Gardner fd271d237c Merge branch 'master' into csp 2018-05-22 10:44:08 -04:00
Kim Gardner 04ae6fbb43 Merge pull request #1637 from conversario/notification-translations
German translations for the email notification plugins.
2018-05-22 10:43:50 -04:00