Commit Graph

  • 921b85fba3 Merge branch 'master' into karma Kim Gardner 2018-05-23 16:47:52 -04:00
  • 9c7ed62cba Merge pull request #1644 from erikreyna/patch-1 Kim Gardner 2018-05-23 16:47:02 -04:00
  • b7a053c011 Merge branch 'master' into patch-1 Wyatt Johnson 2018-05-23 13:28:20 -06:00
  • 6548df971c Merge branch 'master' into karma Kim Gardner 2018-05-23 15:19:32 -04:00
  • 27818d966d Merge pull request #1642 from babolivier/patch-1 Kim Gardner 2018-05-23 14:43:46 -04:00
  • f7f6ed635c add from to import statement Erik Reyna 2018-05-23 14:24:11 -04:00
  • 61c09f5818 Merge branch 'master' into patch-1 Wyatt Johnson 2018-05-23 12:17:05 -06:00
  • def20a3b37 Merge pull request #1643 from smic1909/patch-1 Wyatt Johnson 2018-05-23 12:16:48 -06:00
  • 4ae3e90422 Merge branch 'master' into patch-1 Wyatt Johnson 2018-05-23 12:09:44 -06:00
  • 9539073eb8 Merge pull request #1633 from coralproject/csp Wyatt Johnson 2018-05-23 12:08:45 -06:00
  • 422260607e Merge branch 'master' into csp Wyatt Johnson 2018-05-23 11:53:24 -06:00
  • a16c584880 Merge branch 'master' into patch-1 Wyatt Johnson 2018-05-23 11:25:14 -06:00
  • 3fcc85139d Merge pull request #1641 from coralproject/locales Wyatt Johnson 2018-05-23 10:12:27 -06:00
  • 17f76e85b0 changes okbel 2018-05-23 13:07:34 -03:00
  • a95d55b6da Remuve dupe "apply" Brendan Abolivier 2018-05-23 10:05:21 +02:00
  • 879865a4c1 Fix broken link to tokenusernotfound Simon 2018-05-23 09:14:32 +02:00
  • 8405bdf9bc Merge branch 'karma' of git+ssh://github.com/coralproject/talk into karma Kim Gardner 2018-05-22 20:12:40 -04:00
  • 8e24d4f5c6 Make it so low threshold is included in karma calc Kim Gardner 2018-05-22 20:12:17 -04:00
  • 9265d29ac0 Merge branch 'master' into karma Kim Gardner 2018-05-22 19:00:12 -04:00
  • 849fe37b9b Fix incorrect statement regarding GDPR Brendan Abolivier 2018-05-22 23:25:12 +02:00
  • 1a52ad5d97 Merge branch 'master' into locales Wyatt Johnson 2018-05-22 14:42:43 -06:00
  • b984af3e2e Merge pull request #1638 from coralproject/akismet-bug Wyatt Johnson 2018-05-22 14:42:24 -06:00
  • 10a786f84d simplified language negotiation Wyatt Johnson 2018-05-22 14:21:32 -06:00
  • 4f5f424c77 Remove wordbreak Mendel Konikov 2018-05-22 15:49:19 -04:00
  • 9b4455f7bd Merge branch 'master' into csp Kiwi 2018-05-22 16:39:20 -03:00
  • 3a12e776c3 Merge branch 'master' into akismet-bug Kim Gardner 2018-05-22 15:01:50 -04:00
  • 6667bbe01f Docs typo Kim Gardner 2018-05-22 13:18:28 -04:00
  • 583cb6566b Merge branch 'master' into karma Kim Gardner 2018-05-22 12:54:09 -04:00
  • f90e17c3e0 Merge pull request #1625 from coralproject/party-fixes Kim Gardner 2018-05-22 12:52:08 -04:00
  • 71b1259db6 Merge branch 'master' into akismet-bug Kim Gardner 2018-05-22 12:21:53 -04:00
  • a39b967164 Merge branch 'master' into party-fixes Kiwi 2018-05-22 13:19:08 -03:00
  • b411f3e059 relying on ip okbel 2018-05-22 13:08:59 -03:00
  • 1aed51468f req not properly passed okbel 2018-05-22 12:40:21 -03:00
  • fd271d237c Merge branch 'master' into csp Kim Gardner 2018-05-22 10:44:08 -04:00
  • 04ae6fbb43 Merge pull request #1637 from conversario/notification-translations Kim Gardner 2018-05-22 10:43:50 -04:00
  • 4767354379 German translations for the email notification plugins. Fabian Neumann 2018-05-22 12:36:25 +02:00
  • 55998a67da Merge branch 'master' into csp Kim Gardner 2018-05-21 16:18:46 -04:00
  • eee1e858bf Merge pull request #1634 from mkonikov/disabled-download-button Kim Gardner 2018-05-21 16:18:30 -04:00
  • 2c9d30bfd2 Small modification Kiwi 2018-05-21 17:09:36 -03:00
  • 763833783d Merge branch 'master' into disabled-download-button Kim Gardner 2018-05-21 15:22:51 -04:00
  • 1f5e3d9f3f Merge pull request #1635 from conversario/translations-de-4.4.1 Kim Gardner 2018-05-21 11:19:05 -04:00
  • 30f03f5fb8 Merge branch 'master' into disabled-download-button Kim Gardner 2018-05-21 11:07:59 -04:00
  • 43c7b6f23f Merge branch 'master' into karma Kim Gardner 2018-05-21 11:07:34 -04:00
  • ced9d2ea4b Merge branch 'master' into translations-de-4.4.1 Kim Gardner 2018-05-21 11:06:17 -04:00
  • 5aba578a98 doc patch Wyatt Johnson 2018-05-18 16:47:58 -06:00
  • dd0ad17038 fix for custom css Wyatt Johnson 2018-05-18 16:44:43 -06:00
  • 868343a29b fixes to csp policy Wyatt Johnson 2018-05-18 16:42:23 -06:00
  • 5403872bb7 disable by default Wyatt Johnson 2018-05-18 16:21:41 -06:00
  • f58e3df439 added config for report only mode Wyatt Johnson 2018-05-18 15:27:29 -06:00
  • 000d9ae56a Merge branch 'master' into csp Wyatt Johnson 2018-05-18 15:28:26 -06:00
  • e2ba08e708 Merge pull request #1632 from mkonikov/extra-p Kim Gardner 2018-05-18 17:18:00 -04:00
  • 20860bb773 Merge branch 'master' into extra-p Kim Gardner 2018-05-18 16:33:27 -04:00
  • b15766bf80 Merge pull request #1629 from coralproject/rte-bugfixes Kim Gardner 2018-05-18 16:33:15 -04:00
  • 531cb0793f Merge branch 'master' into rte-bugfixes Kim Gardner 2018-05-18 16:24:30 -04:00
  • 8265c13149 Merge branch 'master' into extra-p Wyatt Johnson 2018-05-18 11:26:37 -06:00
  • b816053191 Updating the cache okbel 2018-05-18 14:07:10 -03:00
  • ffa6b99d09 Wrap els in div Mendel Konikov 2018-05-18 12:32:24 -04:00
  • 0e8065cdf9 Styling okbel 2018-05-18 13:31:50 -03:00
  • 9484d4c6f5 Merge branch 'master' into csp Wyatt Johnson 2018-05-18 10:11:39 -06:00
  • 5ebbc24264 Merge branch 'master' into karma Belén Curcio 2018-05-18 13:09:07 -03:00
  • 43e0f95aa6 Merge branch 'party-fixes' of github.com:coralproject/talk into party-fixes okbel 2018-05-18 13:07:03 -03:00
  • 1f40d6b7bb replacing by a one liner :) okbel 2018-05-18 13:05:46 -03:00
  • 8ee90387f6 German translations for v4.4.1 Fabian Neumann 2018-05-07 12:33:47 +02:00
  • 43170121f3 Merge branch 'master' into party-fixes Wyatt Johnson 2018-05-17 21:03:12 -06:00
  • 4f001bbdf2 Merge pull request #1628 from conversario/withremovetag-typo Wyatt Johnson 2018-05-17 21:02:37 -06:00
  • f5362f445a Merge branch 'master' into withremovetag-typo Wyatt Johnson 2018-05-17 20:48:33 -06:00
  • 1bcf1a23fc Merge branch 'master' into extra-p Wyatt Johnson 2018-05-17 20:34:37 -06:00
  • b2306066ce Merge pull request #1627 from coralproject/upgrade-mongoose Wyatt Johnson 2018-05-17 20:32:40 -06:00
  • ebcff4d95e patched migration bugs Wyatt Johnson 2018-05-17 18:58:01 -06:00
  • 2484066922 Merge branch 'master' into upgrade-mongoose Wyatt Johnson 2018-05-17 18:43:24 -06:00
  • 2822a2dddd Merge branch 'master' into csp Wyatt Johnson 2018-05-17 18:43:12 -06:00
  • 5f410276c6 Show overflow text on download comments button when disabled Mendel Konikov 2018-05-17 20:41:59 -04:00
  • c84a9716a1 added support for csp Wyatt Johnson 2018-05-17 18:37:50 -06:00
  • d83c2fd566 Only display paragraph if delete requested Mendel Konikov 2018-05-17 20:03:12 -04:00
  • cd6aacbc76 Merge pull request #1607 from coralproject/admin-auth Kim Gardner 2018-05-17 19:08:21 -04:00
  • 95072be97e switched ejs for nunjucks Wyatt Johnson 2018-05-17 15:59:49 -06:00
  • f0589fba26 Merge branch 'master' into admin-auth Kiwi 2018-05-17 16:36:32 -03:00
  • 417befd52a Don't close popup when there is an error Chi Vinh Le 2018-05-17 21:34:37 +02:00
  • 8d8cd57d79 Merge branch 'master' into upgrade-mongoose Wyatt Johnson 2018-05-17 13:19:09 -06:00
  • 086c43a003 Update .nsprc Wyatt Johnson 2018-05-17 13:18:57 -06:00
  • 887f7e17f4 server side Wyatt Johnson 2018-05-17 11:38:00 -06:00
  • 6444e8c2ab Karma okbel 2018-05-17 13:48:30 -03:00
  • 0339e97b37 fix optimisticResponse typo Leandro 2018-05-17 16:39:04 +02:00
  • ae88ae3f98 Merge pull request #1614 from conversario/comment-tombstone-slot Kiwi 2018-05-16 21:00:13 -03:00
  • 5241206b03 Remove deprecated useMongoClient Kim Gardner 2018-05-16 18:24:34 -04:00
  • 663caa1001 Update lint-staged to fix dependency issue Kim Gardner 2018-05-16 18:18:36 -04:00
  • d07c54918d Indent, outdent fixes Chi Vinh Le 2018-05-16 21:37:48 +02:00
  • 2eac8f48d6 Workaround IOS focus bug when clicking on buttons Chi Vinh Le 2018-05-16 21:37:35 +02:00
  • 1a29f374a5 Merge branch 'master' into reject-username Wyatt Johnson 2018-05-16 11:20:28 -06:00
  • 3a383ff8ba Merge branch 'master' into admin-auth Kim Gardner 2018-05-16 12:58:59 -04:00
  • 34760653a2 Merge branch 'master' into comment-tombstone-slot Kim Gardner 2018-05-16 12:58:51 -04:00
  • d176578aed Merge branch 'master' into party-fixes Kim Gardner 2018-05-16 12:41:34 -04:00
  • e3323ce5ec Merge pull request #1544 from conversario/global-switchoff Kim Gardner 2018-05-16 12:14:09 -04:00
  • 7fc5c5a6be Merge branch 'master' into comment-tombstone-slot Belén Curcio 2018-05-16 12:55:24 -03:00
  • 2524004e2a Styling okbel 2018-05-16 11:55:05 -03:00
  • 91060537bb displaying multiple provider ids okbel 2018-05-16 11:51:28 -03:00
  • f0b87501c0 Merge branch 'master' into admin-auth Kim Gardner 2018-05-15 19:06:27 -04:00
  • ea6757cce5 Merge branch 'master' into global-switchoff Kim Gardner 2018-05-15 18:55:58 -04:00
  • cb9945053f Merge pull request #1624 from coralproject/username-change-copy Kim Gardner 2018-05-15 18:48:31 -04:00
  • fca6603b38 Merge branch 'master' into admin-auth Kim Gardner 2018-05-15 18:13:05 -04:00