Commit Graph
2643 Commits
Author SHA1 Message Date
riley 7bfa718830 remove like widget for now 2017-03-13 12:15:38 -06:00
Riley DavisandGitHub bf31f07053 Merge pull request #404 from coralproject/keyboard-shortcut-scroll
Scrolling to keep selected comments in view.
2017-03-13 11:52:08 -06:00
Riley DavisandGitHub 6d3bb6af03 Merge branch 'master' into keyboard-shortcut-scroll 2017-03-13 11:14:04 -06:00
Riley Davis f999be6fbf scrollIntoView will work in more browsers 2017-03-13 11:13:28 -06:00
David ErwinandGitHub 15e962c985 Merge pull request #409 from coralproject/revert-version-pin
Removed the version pin
2017-03-13 12:01:18 -04:00
Wyatt Johnson 8e6c2e8075 Resolved #357 2017-03-13 09:43:47 -06:00
David ErwinandGitHub eb00320a0c Merge pull request #405 from coralproject/asset-comment-total-count
Added support for total comment count
2017-03-13 11:32:35 -04:00
David ErwinandGitHub 33062ca43e Merge branch 'master' into asset-comment-total-count 2017-03-13 11:14:36 -04:00
David ErwinandGitHub 5ceaa24217 Merge pull request #408 from coralproject/widen-notifications
make notifications wider
2017-03-13 10:18:28 -04:00
David ErwinandGitHub 9f5648b4c3 Merge branch 'master' into widen-notifications 2017-03-13 10:14:51 -04:00
Riley DavisandGitHub 087851f694 Merge pull request #403 from coralproject/bugfix-ban-dialog-language
Hiding rejected note on ban dialog for rejected comments.
2017-03-10 15:08:27 -07:00
Riley DavisandGitHub e159435293 Merge branch 'master' into bugfix-ban-dialog-language 2017-03-10 14:50:49 -07:00
Riley Davis 9d9d336e06 make notifications wider 2017-03-10 13:54:33 -07:00
Wyatt Johnson 93221de563 Added support for total comment count 2017-03-09 17:07:07 -07:00
David Jay 255807858d Scrolling to keep selected comments in view. 2017-03-09 18:06:44 -05:00
Riley DavisandGitHub 5893e0cbde Merge pull request #398 from coralproject/widget-auto-update
Auto-update Dashboard
2017-03-09 13:19:39 -07:00
Riley DavisandGitHub 0a88d3da97 Merge branch 'master' into widget-auto-update 2017-03-09 13:15:56 -07:00
Riley DavisandGitHub d46b06da1c Merge pull request #401 from coralproject/remove-notification-warning
incorrectly using dispatch now that we do pym directly
2017-03-09 13:01:37 -07:00
Riley Davis cb10de6c7a modify to light grey 2017-03-09 12:58:57 -07:00
Riley Davis 98a87f4595 Merge branch 'master'
Conflicts:
	client/coral-admin/src/containers/Dashboard/Widget.css
2017-03-09 12:22:20 -07: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
Riley DavisandGitHub 82f47e27ac Merge pull request #396 from coralproject/open-closed-stream-buttons
fix some firefox display things
2017-03-09 11:50:28 -07:00
David JayandGitHub 3232c04997 Merge branch 'master' into remove-notification-warning 2017-03-09 13:50:09 -05:00
Riley DavisandGitHub e6dfb3f64a Merge branch 'master' into open-closed-stream-buttons 2017-03-09 11:44:47 -07:00
Riley DavisandGitHub fb7895b02f Merge branch 'master' into widget-auto-update 2017-03-09 11:44:16 -07:00
Riley DavisandGitHub a152b9f1d3 Merge pull request #392 from coralproject/mod-queue-load-more
Load More button in mod queue
2017-03-09 11:43:27 -07: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
Belén CurcioandGitHub c3749c5e31 Merge branch 'master' into autoreject-on-ban 2017-03-09 13:27:30 -05:00
David ErwinandGitHub ebdf4b5ec7 Merge branch 'master' into open-closed-stream-buttons 2017-03-09 13:15:45 -05:00
David ErwinandGitHub 53043051f3 Merge branch 'master' into bugfix-ban-dialog-language 2017-03-09 13:13:10 -05:00
David ErwinandGitHub a195879556 Merge branch 'master' into widget-auto-update 2017-03-09 13:11:17 -05:00
David ErwinandGitHub b0ca4d0785 Merge pull request #400 from coralproject/flag-username-reset
Resetting report menu on close.
2017-03-09 13:10:31 -05:00
David JayandGitHub 39386a9fcf Merge branch 'master' into mod-queue-load-more 2017-03-09 13:07:41 -05:00
Riley Davis 0db92974c4 make only the title clickable 2017-03-09 11:05:18 -07:00
David ErwinandGitHub f64063ba14 Merge branch 'master' into flag-username-reset 2017-03-09 12:57:09 -05:00
David ErwinandGitHub 91dff157aa Merge pull request #394 from coralproject/bugfix-mod-queue-refresh
Preventing admin panel refresh on accept and reject
2017-03-09 12:55:24 -05:00
David JayandGitHub fd9f838948 Merge branch 'master' into open-closed-stream-buttons 2017-03-09 12:39:54 -05:00
Riley DavisandGitHub db5df1699c Merge branch 'master' into autoreject-on-ban 2017-03-09 10:30:10 -07:00
Riley DavisandGitHub c064bee4f6 Merge branch 'master' into flag-username-reset 2017-03-09 10:27:27 -07:00
Riley DavisandGitHub 895d3c31fc Merge branch 'master' into bugfix-mod-queue-refresh 2017-03-09 10:24:25 -07:00
Riley DavisandGitHub 070ed13495 Merge branch 'master' into mod-queue-load-more 2017-03-09 10:15:08 -07:00
Belén CurcioandGitHub 6a72f4d066 Merge pull request #397 from coralproject/long-titles
Adding fix for handling long titles in the Moderation Queue
2017-03-09 11:17:11 -05:00
Belén CurcioandGitHub 9bfc7d2037 Merge branch 'master' into long-titles 2017-03-09 11:05:08 -05:00
Belen Curcio 438877d58f Merge branch 'long-titles' of github.com:coralproject/talk into long-titles 2017-03-09 11:03:37 -05:00
Belen Curcio ce7a2d54d0 Font Size 2017-03-09 10:59:28 -05:00