Commit Graph

2055 Commits

Author SHA1 Message Date
Benjamin Goering 994b5006b6 Merge branch 'master' into edit-comment 2017-05-09 09:12:14 -07:00
Kiwi 4eb20108b1 Merge branch 'master' into approve-reject-noop 2017-05-09 20:06:11 +07: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
Riley Davis c00e6c1ece default view is moderate > all 2017-05-08 13:40:24 -06: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
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
Benjamin Goering b97fa228b1 merge with master after huge coral-embed-stream refactor 2017-05-03 19:19:03 -07:00
Benjamin Goering 0ba973fb44 editComment returns status of comment after edit. UI shows appropriate notifications if PREMOD or REJECTED 2017-05-03 18:05:06 -07:00
Benjamin Goering 3ac8f09619 Notify on unexpected error when saving edit changes 2017-05-03 17:31:36 -07:00
Benjamin Goering ab9c2a89b7 Edit Window countdown is bold when < 10 seconds left 2017-05-03 17:27:36 -07:00
Benjamin Goering e31961716e Remove done todo comments 2017-05-03 17:14:36 -07:00
Benjamin Goering b83381719c Style editCommentWindow messages and i18n 2017-05-03 15:37:02 -07:00
Kim Gardner 7d0d4aa397 Merge branch 'master' into admin-queue-polish 2017-05-03 17:57:34 -04:00
Benjamin Goering 92fd146a8c Add cancel button to editing CommentForm 2017-05-03 14:22:15 -07:00
Benjamin Goering 3cb84222b2 Add new padding, color, border-color to CommentBox textarea 2017-05-03 14:14:23 -07:00
Benjamin Goering c8e7ec6cbf streamQuery reduces editComment mutations to reflect edits without contacting server 2017-05-03 13:35:51 -07:00
riley d02c82d0cd Merge branch 'master' into admin-queue-polish 2017-05-03 14:25:46 -06:00
Riley Davis 1cecad4d32 action_type must be passed to the load more query 2017-05-03 14:13:58 -06:00
riley c15c312c2c typo 2017-05-03 13:35:33 -06:00
Benjamin Goering ae3cbe990b Edit Comment UI reflects expired edit comment window 2017-05-03 12:34:22 -07:00
Riley Davis e993328dc4 load only flagged comments in mod queue load more 2017-05-03 13:15:29 -06:00
riley 3c6391e741 count should never be less than 0 2017-05-03 12:49:22 -06:00
riley 39bd0eca6f remove pointless change 2017-05-03 12:45:49 -06:00
riley 354b51b4fe use a reduce instead 2017-05-03 11:14:21 -06:00
Riley Davis c78e00711a remove if statements 2017-05-03 10:54:52 -06:00
Riley Davis 324e82c070 not pretty, but it works 2017-05-03 10:20:03 -06:00
Benjamin Goering b9a3466e2e Edit UI sends editComment mutation, handles errors 2017-05-02 22:07:23 -05:00
riley e60bcb9caf make sure load more on approve/reject queues doesn't cause a bug 2017-05-02 15:58:57 -06:00
riley b7d3113677 apparently you can't make a fragment on RootQuery 2017-05-02 15:18:48 -06:00