Commit Graph
100 Commits
Author SHA1 Message Date
David Jayandgaba ae4bae6cd2 Scrolling to keep selected comments in view. 2017-03-20 07:36:17 -07:00
David Jayandgaba a243310ecd Merge branch 'master' into bugfix-ban-dialog-language 2017-03-20 07:32:54 -07:00
David Jayandgaba 88538d7b64 Merge branch 'master' into remove-notification-warning 2017-03-20 07:29:05 -07:00
David Jayandgaba 2d968126ab Merge branch 'master' into remove-notification-warning 2017-03-20 07:29:05 -07:00
David Jayandgaba 1fd74068cd Merge branch 'master' into open-closed-stream-buttons 2017-03-20 07:27:18 -07:00
David Jayandgaba 203776d07c Merge branch 'mod-queue-load-more' of github.com:coralproject/talk into mod-queue-load-more 2017-03-20 07:27:16 -07:00
David Jayandgaba a5e6689f81 Merge pull request #402 from coralproject/autoreject-on-ban
Autoreject on ban
2017-03-20 07:27:15 -07:00
David Jayandgaba a78648fc0d Merge branch 'master' into mod-queue-load-more 2017-03-20 07:27:15 -07:00
David Jay 255807858d Scrolling to keep selected comments in view. 2017-03-09 18:06:44 -05:00
David JayandGitHub 1884ad6437 Merge branch 'master' into bugfix-ban-dialog-language 2017-03-09 13:51:51 -05:00
David JayandGitHub 3c296ea4e9 Merge branch 'master' into remove-notification-warning 2017-03-09 13:51:21 -05:00
David JayandGitHub 3232c04997 Merge branch 'master' into remove-notification-warning 2017-03-09 13:50:09 -05:00
David JayandGitHub 542ccc6190 Merge branch 'master' into bugfix-ban-dialog-language 2017-03-09 13:40:44 -05:00
David Jay 8f988c898d Merge branch 'mod-queue-load-more' of github.com:coralproject/talk into mod-queue-load-more 2017-03-09 13:36:59 -05:00
David JayandGitHub 66adf19b97 Merge branch 'master' into mod-queue-load-more 2017-03-09 13:36:37 -05:00
David JayandGitHub f24eb74745 Merge pull request #402 from coralproject/autoreject-on-ban
Autoreject on ban
2017-03-09 13:35:10 -05:00
David Jay a0953c0689 Adding proptypes to loadmore component. 2017-03-09 13:33:00 -05:00
David JayandGitHub 39386a9fcf Merge branch 'master' into mod-queue-load-more 2017-03-09 13:07:41 -05:00
David JayandGitHub fd9f838948 Merge branch 'master' into open-closed-stream-buttons 2017-03-09 12:39:54 -05:00
David JayandGitHub 9b53930861 Merge branch 'master' into flag-username-reset 2017-03-08 17:49:59 -05:00
David JayandGitHub 7bf5285a1d Merge branch 'master' into bugfix-ban-dialog-language 2017-03-08 17:10:14 -05:00
David JayandGitHub a8d090d5a2 Merge branch 'master' into autoreject-on-ban 2017-03-08 17:07:26 -05:00
David Jay 377563c798 Hiding rejected note on ban dialog for rejected comments. 2017-03-08 17:02:47 -05:00
David Jay fac3d26c22 Closing ban dialog after ban is complete. 2017-03-08 16:39:53 -05:00
David Jay d203a9afe0 Auto-rejecting comments on ban. 2017-03-08 16:06:34 -05:00
David Jay 3262d136b7 Resetting report menu on close. 2017-03-08 15:44:19 -05:00
David JayandGitHub 3c28f68d0a Merge branch 'master' into mod-squad 2017-03-08 15:32:48 -05:00
David JayandGitHub a13e0205de Merge branch 'master' into open-closed-stream-buttons 2017-03-08 15:22:08 -05:00
David JayandGitHub be3212e144 Merge branch 'master' into banned-optimize-bug 2017-03-08 15:05:12 -05:00
David JayandGitHub 510ee2c28e Merge branch 'master' into bugfix-mod-queue-refresh 2017-03-08 15:04:45 -05:00
David JayandGitHub 3861d14a07 Merge branch 'master' into mod-queue-load-more 2017-03-08 15:04:24 -05:00
David Jay 15193e97a8 Preventing keys from scrolling past the end of the comment queue. 2017-03-08 13:01:37 -05:00
David JayandGitHub 7e55ecab59 Merge pull request #388 from coralproject/reply-box-focus
Focusing on reply box when reply is clicked.
2017-03-07 14:19:37 -05:00
David Jay 95aa89faed Switching premod status update to updateQueries function. 2017-03-07 14:16:44 -05:00
David JayandGitHub d0d0766ca6 Merge branch 'master' into notification-warning 2017-03-07 13:33:24 -05:00
David JayandGitHub 1e34ffd075 Merge branch 'master' into banned-optimize-bug 2017-03-07 13:31:12 -05:00
David JayandGitHub 2b947bebf8 Merge pull request #383 from coralproject/premod-links
Premod links
2017-03-07 13:30:20 -05:00
David Jay 78a2a64671 Not displaying premod or rejected comments. 2017-03-07 13:13:21 -05:00
David JayandGitHub 3d4521ab1d Merge pull request #384 from coralproject/global-info-bug
Guidelines info box has a word wrapping issue
2017-03-07 13:11:39 -05:00
David JayandGitHub ae5d35273b Merge branch 'master' into global-info-bug 2017-03-07 12:58:25 -05:00
David JayandGitHub 9bf1246d3a Merge pull request #386 from coralproject/configure-bugs
Configure Styles and UX Polish
2017-03-07 12:58:02 -05:00
David JayandGitHub 7379924e21 Merge branch 'master' into global-info-bug 2017-03-07 12:56:19 -05:00
David JayandGitHub bf1d46d60d Merge branch 'master' into configure-bugs 2017-03-07 12:52:57 -05:00
David JayandGitHub 2c8678f9e1 Merge pull request #391 from coralproject/favicon
Favicon Support
2017-03-07 12:52:28 -05:00
David Jay 2a6236b618 Moving ModerationMenu to a stateless compenent. 2017-03-07 12:37:12 -05:00
David Jay 54aa3bc8fa Styling load more button. 2017-03-07 12:31:43 -05:00
David Jay d5b46f219e Adding load more button. 2017-03-07 11:54:44 -05:00
David Jay 450f1fdbac Focusing on reply box when reply is clicked. 2017-03-06 13:25:01 -05:00
David JayandGitHub 77386fb21d Merge pull request #385 from coralproject/version-endpoint-fix
Moved to correct route
2017-03-06 12:04:19 -05:00
David JayandGitHub 3280ed9ae5 Merge branch 'master' into premod-links 2017-03-03 16:17:40 -05:00
David Jay be8332da66 Switching link action from flag to premod. 2017-03-03 16:12:53 -05:00
David Jay b9488dc36c Updating moderation. 2017-03-03 16:09:34 -05:00
David Jay b912b60428 Removing unecessary log statement. 2017-03-03 16:01:53 -05:00
David Jay 2e5d453ea7 Updating link search and adding settings in admin panel. 2017-03-03 15:44:03 -05:00
David Jay cb88f0a9b7 Flagging links when settings are set appropriately. 2017-03-03 14:32:57 -05:00
David Jay 45208b096f Correcting bug in prev keyboard shortcut. 2017-03-03 12:52:20 -05:00
David Jay 3ecb93365a Correcting bug in keyboard shortcut next and previous. 2017-03-03 12:50:39 -05:00
David Jay b92ea72b78 Re-enabling premod links in settings. 2017-03-02 16:44:36 -05:00
David Jay 57a7000e59 Animating transition in mod queue. 2017-03-02 16:08:24 -05:00
David Jay d554bf5211 Adding single view and restyling selected comment. 2017-03-02 16:03:18 -05:00
David Jay 1146f22613 Accepting and rejecting comments w/ keystrokes. 2017-03-02 15:41:51 -05:00
David Jay 78be17ec6d Adding keyboard selection of comments. 2017-03-02 15:19:33 -05:00
David Jay 7be3b05f22 Re-enabling keyboard shortcut menu. 2017-03-02 14:51:51 -05:00
David Jay 06f9c12f5e Updating comment count. 2017-03-02 13:11:16 -05:00
David Jay 609af767e8 Merge branch 'master' of github.com:coralproject/talk into bugfix-e2e-permalink 2017-03-02 13:04:32 -05:00
David Jay acda388d4e Updating e2e tests. 2017-03-02 13:00:54 -05:00
David Jay 9cb835b08b Setting action user_id to null on suspect words. 2017-03-01 14:49:42 -05:00
David Jay 0085d2bb04 Preventing premod comments from being posted optimistically. 2017-03-01 14:21:03 -05:00
David JayandGitHub 3b04dab0d5 Merge branch 'master' into bugfix-user-state 2017-03-01 12:57:40 -05:00
David JayandGitHub 230488117f Merge branch 'master' into bugfix-user-state 2017-02-28 18:20:00 -05:00
David Jay d8117494d1 Cleaning up after merge conflict. 2017-02-28 18:18:17 -05:00
David JayandGitHub e68358a211 Merge branch 'master' into fix-permalink 2017-02-28 18:07:31 -05:00
David Jay fed28b3eec Refetching on login and logout. 2017-02-28 16:13:51 -05:00
David Jay 037f5be377 Merge branch 'master' of github.com:coralproject/talk into fix-permalink 2017-02-28 14:28:32 -05:00
David Jay 62fe63d323 Scrolling to permalinked comment or reply. 2017-02-28 14:27:53 -05:00
David Jay 158f31d603 Highlighting permalinked comment. 2017-02-28 13:55:28 -05:00
David JayandGitHub b9297b6079 Merge branch 'master' into mod-queue-sort 2017-02-28 12:11:05 -05:00
David Jay 95a9259c06 Fixing bug with mod queue sorting. 2017-02-28 12:06:27 -05:00
David Jay bf23fc2974 Moving comment id into query. 2017-02-28 12:02:51 -05:00
David JayandGitHub 303148e5ba Merge pull request #345 from coralproject/bugfix-second-new-comments
Prevents "0" from appearing on empty comment streams
2017-02-27 15:34:40 -05:00
David JayandGitHub 1b495b9b09 Merge branch 'master' into bugfix-second-new-comments 2017-02-27 14:57:24 -05:00
David JayandGitHub 373d0de576 Merge pull request #346 from coralproject/mod-queue-sort
Adding sort to moderation queue.
2017-02-27 14:57:09 -05:00
David Jay ab16e5bfe7 Retrieving comment y id from backend 2017-02-27 14:26:20 -05:00
David JayandGitHub dfd211deda Merge branch 'master' into mod-queue-sort 2017-02-27 14:05:04 -05:00
David JayandGitHub 83e713d889 Merge branch 'master' into bugfix-second-new-comments 2017-02-27 12:34:11 -05:00
David JayandGitHub a47e2378e9 Merge pull request #331 from coralproject/dont-agree
Don't Agree flags
2017-02-27 12:32:56 -05:00
David Jay 491f254206 Merge branch 'mod-queue-sort' of github.com:coralproject/talk into mod-queue-sort 2017-02-27 12:30:04 -05:00
David JayandGitHub 2b22ce076c Merge branch 'master' into mod-queue-sort 2017-02-27 12:29:42 -05:00
David JayandGitHub 22793c02e2 Merge branch 'master' into dont-agree 2017-02-27 12:29:19 -05:00
David Jay 37b08fd4e4 Displaying oldest first by default. 2017-02-27 12:28:13 -05:00
David JayandGitHub 847df91cbc Merge branch 'master' into bugfix-second-new-comments 2017-02-24 20:03:42 -05:00
David Jay 66a890458c Adding sort to moderation queue. 2017-02-24 17:42:29 -05:00
David Jay 6a9d8c0436 Removing refetch and prevent 0 from displaying on empty comment streams. 2017-02-24 15:51:43 -05:00
David Jay dcc16dc598 Removing extra semicolon. 2017-02-24 14:45:47 -05:00
David JayandGitHub 4015bea1db Merge branch 'master' into story-140080313-modal-dn 2017-02-24 14:39:51 -05:00
David Jay b150668d86 Merge branch 'comment-design-pass' of github.com:coralproject/talk into comment-design-pass 2017-02-23 17:11:21 -05:00
David Jay 39536046c9 Fixing permalink icon and adding padding to comment content. 2017-02-23 17:08:35 -05:00
David Jay e735fb800a Updating button and signin style. 2017-02-23 17:02:35 -05:00
David JayandGitHub 66ef4e38a8 Merge branch 'master' into comment-design-pass 2017-02-23 16:28:20 -05:00
David JayandGitHub 423095360e Merge pull request #336 from coralproject/new-comments
View New Comments
2017-02-23 16:25:16 -05:00