Commit Graph

9833 Commits

Author SHA1 Message Date
Mendel Konikov 4f5f424c77 Remove wordbreak 2018-05-22 15:49:19 -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
Kiwi ae88ae3f98 Merge pull request #1614 from conversario/comment-tombstone-slot
Add new slot 'commentTombstone'
2018-05-16 21:00:13 -03:00
Kim Gardner 3a383ff8ba Merge branch 'master' into admin-auth 2018-05-16 12:58:59 -04:00
Kim Gardner 34760653a2 Merge branch 'master' into comment-tombstone-slot 2018-05-16 12:58:51 -04:00
Kim Gardner e3323ce5ec Merge pull request #1544 from conversario/global-switchoff
New setting: Disable commenting site-wide
2018-05-16 12:14:09 -04:00
Belén Curcio 7fc5c5a6be Merge branch 'master' into comment-tombstone-slot 2018-05-16 12:55:24 -03:00
Kim Gardner f0b87501c0 Merge branch 'master' into admin-auth 2018-05-15 19:06:27 -04:00
Kim Gardner ea6757cce5 Merge branch 'master' into global-switchoff 2018-05-15 18:55:58 -04:00
Kim Gardner cb9945053f Merge pull request #1624 from coralproject/username-change-copy
Username change copy
2018-05-15 18:48:31 -04:00
Kim Gardner fca6603b38 Merge branch 'master' into admin-auth 2018-05-15 18:13:05 -04:00
Kim Gardner 56ee58efdf Merge branch 'master' into global-switchoff 2018-05-15 17:55:35 -04:00
Wyatt Johnson 0b407d516b copy updates 2018-05-15 15:51:14 -06:00
Kim Gardner 4cca800af0 Merge pull request #1623 from coralproject/wyattjoh-patch-1
Bump to 4.4.1
v4.4.1
2018-05-15 13:32:49 -04:00
Wyatt Johnson ee0790dbe8 Update package.json 2018-05-15 11:25:58 -06:00
Kim Gardner 6890d24e47 Merge pull request #1616 from coralproject/gdpr-change-email-bug
GDPR Bug - Confirm Email Dialog inputs shouldn't be connected to the save button in the background
2018-05-15 12:54:39 -04:00
okbel 2392e1ca78 Merge branch 'gdpr-change-email-bug' of github.com:coralproject/talk into gdpr-change-email-bug
* 'gdpr-change-email-bug' of github.com:coralproject/talk:
  Set is_test to false
  Added support for new indexes
2018-05-15 13:34:12 -03:00
okbel 40a431b374 Ready 2018-05-15 13:31:29 -03:00
Kim Gardner 5214705f5b Merge branch 'master' into gdpr-change-email-bug 2018-05-15 12:24:47 -04:00
Kim Gardner 79df9b487f Merge pull request #1622 from icco/patch-1
Set Akismet is_test to false
2018-05-15 12:24:23 -04:00
Nat Welch ef5e5ddbcf Set is_test to false
Akismet is no longer in test mode.
2018-05-15 11:55:02 -04:00
Wyatt Johnson 2e773a4438 Merge branch 'master' into gdpr-change-email-bug 2018-05-15 09:27:09 -06:00
Kim Gardner 2a2eabfae0 Merge pull request #1621 from coralproject/indexes
MongoDB Indexes
2018-05-15 11:07:55 -04:00
okbel bb9be71a7a Merge branch 'gdpr-change-email-bug' of github.com:coralproject/talk into gdpr-change-email-bug
* 'gdpr-change-email-bug' of github.com:coralproject/talk:
  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
2018-05-15 12:07:15 -03:00
okbel 50acf9ca50 Removing 2018-05-15 11:47:07 -03:00
Kim Gardner 3ae0136f75 Merge branch 'master' into gdpr-change-email-bug 2018-05-14 17:59:16 -04:00
Wyatt Johnson d3ad486f81 Merge branch 'master' into indexes 2018-05-14 14:52:57 -06:00
Wyatt Johnson 32510db1fa Merge pull request #1618 from coralproject/remove-mod-count-frontend
Remove modqueue counts on the frontend
2018-05-14 14:52:43 -06:00
Wyatt Johnson 8d44525c16 Added support for new indexes 2018-05-14 14:37:27 -06:00
Wyatt Johnson 83fddfdc40 Merge branch 'master' into remove-mod-count-frontend 2018-05-14 14:36:42 -06:00
Kim Gardner ed32a69b68 Merge branch 'master' into gdpr-change-email-bug 2018-05-14 16:32:51 -04:00
Kim Gardner 02b1e03c21 Merge pull request #1620 from coralproject/username-already-exists
Show username already exists error
2018-05-14 16:29:19 -04:00
Chi Vinh Le 08d523a4d6 Remove unused variable 2 2018-05-14 21:38:30 +02:00
Chi Vinh Le b5adea4b2a Remove unused variable 2018-05-14 21:30:09 +02:00
Chi Vinh Le beef4e8b3b Remove ModerationIndicator from container 2018-05-14 21:28:48 +02:00
Chi Vinh Le 5a190839d1 Show username already exists error 2018-05-14 20:44:30 +02:00
Chi Vinh Le ab7e5bc858 No indicator on new queue 2018-05-14 20:05:18 +02:00
Chi Vinh Le 12e848aace Exclude deleted when loading more 2018-05-14 19:27:18 +02:00
Chi Vinh Le 67c3fe3c5b Remove modqueue counts on the frontend 2018-05-14 19:18:34 +02:00
okbel 1f7c4e58a1 sepatate state 2018-05-14 13:31:24 -03:00
Fabian Neumann 8e392ef32d Remove superfluous className 2018-05-14 15:01:51 +02:00
Fabian Neumann 36063b459e Add new slot 'commentTombstone'.
With this slot plugins can override the default tombstone for deleted
comments.
2018-05-14 13:57:46 +02:00
Kim Gardner 400890237c Merge branch 'master' into admin-auth 2018-05-11 18:06:53 -04:00
Wyatt Johnson bde1dff33b changed to seperate slot 2018-05-11 14:45:03 -06:00
Wyatt Johnson f846ef0c06 Merge pull request #1595 from clintabrown/fix-my-profile-title-link
Fix My Profile story title link behavior
2018-05-11 14:37:23 -06:00
Wyatt Johnson fa31541fb7 Merge branch 'master' into fix-my-profile-title-link 2018-05-11 14:13:29 -06:00
Wyatt Johnson 4fcd5dd4f7 Merge pull request #1604 from coralproject/email-attach-fix
Email Attach Fixes
2018-05-11 13:05:45 -06:00
Chi Vinh Le 7d8d5a6115 Use lodash get 2018-05-11 20:46:32 +02:00