Commit Graph

9954 Commits

Author SHA1 Message Date
Kiwi 79a0f0321f Merge branch 'master' into karma 2018-05-25 15:12:57 -03:00
Kim Gardner c7b2641ea7 Merge pull request #1654 from coralproject/docs
Enhanced documentation on JWT's
2018-05-25 14:03:47 -04:00
Kim Gardner ed2842717d Merge branch 'master' into docs 2018-05-25 13:45:12 -04:00
Kim Gardner d9621e6801 Merge pull request #1645 from mkonikov/delete-modal-iphone
[iOS CSS Fix] Improve legibility of the verify text
2018-05-25 13:44:59 -04:00
Kim Gardner d923857eda Merge branch 'master' into delete-modal-iphone 2018-05-25 13:36:01 -04:00
Kim Gardner d96702eef5 Merge pull request #1646 from mkonikov/hr-fix
[CSS Fix] HR line on older devices - Flexbox
2018-05-25 13:35:18 -04:00
Wyatt Johnson e1d77daf47 enhanced docs around jwt's 2018-05-25 11:16:24 -06:00
Kiwi 4ec5ccd1a3 Merge branch 'master' into hr-fix 2018-05-25 14:00:12 -03:00
Kiwi 5e6586d228 Merge branch 'master' into delete-modal-iphone 2018-05-25 13:17:57 -03:00
Kim Gardner cfb162c490 Merge branch 'master' into karma 2018-05-25 12:04:15 -04:00
Wyatt Johnson 3141133e34 Merge pull request #1640 from mkonikov/word-break
Remove wordbreak
2018-05-25 09:12:36 -06:00
Mendel Konikov 4800e32758 Use overflow wrap for better compatibility 2018-05-24 19:07:00 -04:00
Wyatt Johnson 16573b127e text-replace error 2018-05-24 16:19:52 -06:00
Mendel Konikov abafa45be7 Replace break all with break-word 2018-05-24 17:20:54 -04:00
Mendel Konikov ce708bff42 Merge branch 'master' of github.com:mkonikov/talk into word-break 2018-05-24 17:18:29 -04:00
Wyatt Johnson 64c16a1805 support the __webpack_nonce__ parameter 2018-05-24 15:02:08 -06:00
Wyatt Johnson f8cc658c54 csp fixes 2018-05-24 14:34:13 -06:00
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
Mendel Konikov 92420ae827 Fix hr line on older devices 2018-05-23 17:42:40 -04:00
Mendel Konikov a6ec021bd1 Explicitly set opacity to 1 for iPhone 2018-05-23 17:25:09 -04: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