Commit Graph

9886 Commits

Author SHA1 Message Date
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
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
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 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 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
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
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
Fabian Neumann 8ee90387f6 German translations for v4.4.1 2018-05-18 16:03:30 +02:00
Wyatt Johnson 43170121f3 Merge branch 'master' into party-fixes 2018-05-17 21:03:12 -06:00
Wyatt Johnson 4f001bbdf2 Merge pull request #1628 from conversario/withremovetag-typo
fix optimisticResponse typo
2018-05-17 21:02:37 -06:00
Wyatt Johnson f5362f445a Merge branch 'master' into withremovetag-typo 2018-05-17 20:48:33 -06:00
Wyatt Johnson 1bcf1a23fc Merge branch 'master' into extra-p 2018-05-17 20:34:37 -06:00
Wyatt Johnson b2306066ce Merge pull request #1627 from coralproject/upgrade-mongoose
Upgrade Mongoose
2018-05-17 20:32:40 -06:00
Wyatt Johnson ebcff4d95e patched migration bugs 2018-05-17 18:58:01 -06:00
Wyatt Johnson 2484066922 Merge branch 'master' into upgrade-mongoose 2018-05-17 18:43:24 -06:00
Mendel Konikov 5f410276c6 Show overflow text on download comments button when disabled 2018-05-17 20:41:59 -04:00
Mendel Konikov d83c2fd566 Only display paragraph if delete requested 2018-05-17 20:03:12 -04:00
Kim Gardner cd6aacbc76 Merge pull request #1607 from coralproject/admin-auth
External Signin for Admin
2018-05-17 19:08:21 -04:00
Kiwi f0589fba26 Merge branch 'master' into admin-auth 2018-05-17 16:36:32 -03:00
Chi Vinh Le 417befd52a Don't close popup when there is an error 2018-05-17 21:34:37 +02:00
Wyatt Johnson 8d8cd57d79 Merge branch 'master' into upgrade-mongoose 2018-05-17 13:19:09 -06:00
Wyatt Johnson 086c43a003 Update .nsprc 2018-05-17 13:18:57 -06:00
Wyatt Johnson 887f7e17f4 server side 2018-05-17 11:38:00 -06:00
okbel 6444e8c2ab Karma 2018-05-17 13:48:30 -03:00
Leandro 0339e97b37 fix optimisticResponse typo 2018-05-17 16:39:04 +02:00