Commit Graph

2078 Commits

Author SHA1 Message Date
Benjamin Goering cd7b1f2b2b editComment mutation doesn't refetch streamQuery. Instead a reducer updates streamQuery client-side 2017-05-11 10:38:48 -07:00
Benjamin Goering cb90802896 Fix bad merge when CommentBox calls setCommentCountCache 2017-05-11 09:34:33 -07:00
Kim Gardner 1314f1972a Merge branch 'master' into edit-comment 2017-05-10 15:25:27 -04:00
Belen Curcio 0a2b26b599 Exports 2017-05-10 15:53:33 -03:00
Belen Curcio 2673de5059 lintin 2017-05-10 14:59:10 -03:00
Belen Curcio 644d00d5d8 Adding coral-plugin-api 2017-05-10 14:57:24 -03:00
Belen Curcio cb45e33b41 merge 2017-05-10 14:15:24 -03:00
Belen Curcio 26e5631f52 Changing path for hocs 2017-05-10 14:13:32 -03:00
Belen Curcio 3e1b7591e0 Adds displayName for WrappedReactions and alreadyReacted 2017-05-10 14:07:58 -03:00
Belen Curcio 19bf7f6cf8 Adds displayName for WrappedReactions 2017-05-10 13:58:05 -03:00
Belen Curcio ad24ff78d2 Merge branch 'master' of github.com:coralproject/talk into coral-reaction 2017-05-10 13:46:11 -03:00
Belen Curcio 250a578dd7 lint, and merge conficts 2017-05-10 11:05:21 -03:00
Belén Curcio af89ef45f2 Merge branch 'master' into coral-reaction 2017-05-09 15:54:36 -03:00
Benjamin Goering 994b5006b6 Merge branch 'master' into edit-comment 2017-05-09 09:12:14 -07:00
Belen Curcio 3c06ee9360 Adds slots to admin stream 2017-05-09 12:21:21 -03:00
Belén Curcio 5b22bfbac2 Merge branch 'master' into coral-reaction 2017-05-09 11:40:30 -03:00
Kiwi 4eb20108b1 Merge branch 'master' into approve-reject-noop 2017-05-09 20:06:11 +07:00
Belén Curcio 58ce5d5055 Merge branch 'master' into coral-reaction 2017-05-09 08:52:04 -03:00
Kiwi 6fb227eb72 Merge branch 'master' into approve-reject-noop 2017-05-09 17:49:30 +07:00
Benjamin Goering 8af7168f4f Merge branch 'master' into edit-comment 2017-05-08 19:26:38 -07:00
Riley Davis 2490e65981 merge master 2017-05-08 17:09:23 -06:00
Riley Davis 242f3ea5ea do not highlight partial word matches in admin since this is not how the backend works 2017-05-08 17:01:36 -06:00
Kim Gardner b2c8e3b254 Merge branch 'master' into context-from-comment 2017-05-08 17:34:55 -04:00
Kim Gardner 6dd01b4334 Merge branch 'master' into mod-is-main-tab 2017-05-08 17:26:55 -04:00
Riley Davis 3e258b1787 move approved tab 2017-05-08 14:59:23 -06:00
Belen Curcio b82cab0655 Lint 2017-05-08 17:50:15 -03:00
Belen Curcio b547ad44f1 Better and more friendly API 2017-05-08 17:46:56 -03:00
Riley Davis c00e6c1ece default view is moderate > all 2017-05-08 13:40:24 -06:00
Belen Curcio 6934263f71 Ádding uuid v4 2017-05-08 15:59:52 -03:00
Belen Curcio cd18a7e76f Fully working. replaced typename by typereaction. Thanks kiwi 😂 2017-05-08 15:51:17 -03:00
Belen Curcio b7de01b0ad no console 2017-05-08 15:47:08 -03:00
Belen Curcio 011e5da26f Almost fully working 2017-05-08 15:44:11 -03:00
Benjamin Goering 295de61f36 Merge branch 'master' into edit-comment 2017-05-08 10:00:58 -07:00
Benjamin Goering 096025b72a Add asset_id to editComment mutation to allow mongo query happy path to be atomic 2017-05-08 09:57:52 -07:00
Belen Curcio a5f6e1f343 Adding coral-reaction 2017-05-08 11:32:46 -03:00
Benjamin Goering 81879c9bb9 Move getEditableUntilDate into util file 2017-05-08 00:05:14 -07:00
Benjamin Goering 9fb76d35c8 shorten some syntax that could be shorter 2017-05-07 23:54:51 -07:00
Benjamin Goering a7099295d6 CountdownSeconds component has its own file 2017-05-07 23:47:59 -07:00
Benjamin Goering 3d8c521928 CommentForm component is in its own file 2017-05-07 23:44:41 -07:00
Kim Gardner 70bb6f6632 Merge branch 'master' into approve-reject-noop 2017-05-05 16:53:14 -04:00
Riley Davis 4ff42385e3 remove dead code 2017-05-05 14:41:19 -06:00
Riley Davis f8e8eef989 float: right; in css is just fine. 2017-05-05 14:05:52 -06:00
Riley Davis 519ca7beb5 en español 2017-05-05 11:55:28 -06:00
Riley Davis 5db48e8c0f make it a blue link instead of the whole thing 2017-05-05 11:35:18 -06:00
Riley Davis 5f9240f201 open the comment in context when clicked 2017-05-04 16:32:07 -06:00
Riley Davis f3f0b9c858 change mouse cursor for disabled buttons 2017-05-04 15:55:46 -06:00
Riley Davis 4507059a04 same thing for BanUserDialog and the keyboard shortcuts 2017-05-04 15:43:23 -06:00
Riley Davis 67b17160cb don't accept/reject when a comment is already accepted/rejected respectively 2017-05-04 14:42:43 -06:00
Benjamin Goering 636d29af9f When max char count is disabled, allow posting long comments in CommentBox 2017-05-03 19:41:29 -07:00
Benjamin Goering 9b659b024e Add spanish translations for 2 new error strings 2017-05-03 19:27:32 -07:00