Commit Graph
10273 Commits
Author SHA1 Message Date
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
Mendel Konikov 4f5f424c77 Remove wordbreak 2018-05-22 15:49:19 -04: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
Fabian Neumann 4767354379 German translations for the email notification plugins. 2018-05-22 12:36:25 +02:00
Kim Gardner 55998a67da Merge branch 'master' into csp 2018-05-21 16:18:46 -04:00
Kim Gardner eee1e858bf Merge pull request #1634 from mkonikov/disabled-download-button
Show overflow text on download comments button when disabled
2018-05-21 16:18:30 -04:00
Kiwi 2c9d30bfd2 Small modification
Removed obsolete line and add todo
2018-05-21 17:09:36 -03:00
Kim Gardner 763833783d Merge branch 'master' into disabled-download-button 2018-05-21 15:22:51 -04:00
Kim Gardner 1f5e3d9f3f Merge pull request #1635 from conversario/translations-de-4.4.1
German translations for v4.4.1
2018-05-21 11:19:05 -04:00
Kim Gardner 30f03f5fb8 Merge branch 'master' into disabled-download-button 2018-05-21 11:07:59 -04:00
Kim Gardner 43c7b6f23f Merge branch 'master' into karma 2018-05-21 11:07:34 -04:00
Kim Gardner ced9d2ea4b Merge branch 'master' into translations-de-4.4.1 2018-05-21 11:06:17 -04:00
Wyatt Johnson 5aba578a98 doc patch 2018-05-18 16:47:58 -06:00
Wyatt Johnson dd0ad17038 fix for custom css 2018-05-18 16:44:43 -06:00
Wyatt Johnson 868343a29b fixes to csp policy 2018-05-18 16:42:23 -06:00
Wyatt Johnson 5403872bb7 disable by default 2018-05-18 16:21:53 -06:00
Wyatt Johnson f58e3df439 added config for report only mode 2018-05-18 16:21:53 -06:00
Wyatt Johnson 000d9ae56a Merge branch 'master' into csp 2018-05-18 15:28:26 -06:00
Kim Gardner e2ba08e708 Merge pull request #1632 from mkonikov/extra-p
Only display paragraph if delete requested
2018-05-18 17:18:00 -04:00
Kim Gardner 20860bb773 Merge branch 'master' into extra-p 2018-05-18 16:33:27 -04:00
Kim Gardner b15766bf80 Merge pull request #1629 from coralproject/rte-bugfixes
RTE Bugfixes
2018-05-18 16:33:15 -04:00
Kim Gardner 531cb0793f Merge branch 'master' into rte-bugfixes 2018-05-18 16:24:30 -04:00
Wyatt Johnson 8265c13149 Merge branch 'master' into extra-p 2018-05-18 11:26:37 -06:00
okbel b816053191 Updating the cache 2018-05-18 14:07:10 -03:00
Mendel Konikov ffa6b99d09 Wrap els in div 2018-05-18 12:32:24 -04:00
okbel 0e8065cdf9 Styling 2018-05-18 13:31:50 -03:00
Wyatt Johnson 9484d4c6f5 Merge branch 'master' into csp 2018-05-18 10:11:39 -06:00
Belén Curcio 5ebbc24264 Merge branch 'master' into karma 2018-05-18 13:09:07 -03:00
okbel 43e0f95aa6 Merge branch 'party-fixes' of github.com:coralproject/talk into party-fixes
* 'party-fixes' of github.com:coralproject/talk: (33 commits)
  patched migration bugs
  Don't close popup when there is an error
  Update .nsprc
  fix optimisticResponse typo
  Remove deprecated useMongoClient
  Update lint-staged to fix dependency issue
  copy updates
  Update package.json
  Ready
  Set is_test to false
  Removing
  Added support for new indexes
  Remove unused variable 2
  Remove unused variable
  Remove ModerationIndicator from container
  Show username already exists error
  No indicator on new queue
  Exclude deleted when loading more
  Remove modqueue counts on the frontend
  sepatate state
  ...
2018-05-18 13:07:03 -03:00
okbel 1f40d6b7bb replacing by a one liner :) 2018-05-18 13:05:46 -03:00