Commit Graph

  • babd1b3d8d Merge branch 'master' into config-shuffle Kim Gardner 2017-03-15 13:30:43 -04:00
  • 9e890101fa Merge pull request #416 from coralproject/login-error-fix Kim Gardner 2017-03-15 13:28:45 -04:00
  • 9beff74862 correctly handle error when not logged in Riley Davis 2017-03-15 11:16:13 -06:00
  • 3071b3783e move pre-mod links riley 2017-03-15 10:15:47 -06:00
  • 8a84587e54 Merge pull request #414 from coralproject/streams-to-stories Kim Gardner 2017-03-15 11:28:11 -04:00
  • dcb673f072 Changed before/after to pre/post Wyatt Johnson 2017-03-15 09:21:24 -06:00
  • fff9d84303 Initial implementation at plugins Wyatt Johnson 2017-03-14 17:46:04 -06:00
  • 04298aca7d change Stream > Story sometimes Riley Davis 2017-03-14 16:30:02 -06:00
  • dbd1366c26 Merge branch 'master' into recaptcha-support Riley Davis 2017-03-14 15:56:20 -06:00
  • d8ce015b98 Merge pull request #411 from coralproject/remove-like-widget Kim Gardner 2017-03-14 17:45:26 -04:00
  • b612bbd96c Merge branch 'master' into remove-like-widget Riley Davis 2017-03-14 15:35:07 -06:00
  • 099cc36b89 Merge branch 'master' into recaptcha-support Riley Davis 2017-03-14 15:33:18 -06:00
  • 7bbf8abd3d try to just add recaptcha manually Riley Davis 2017-03-14 13:08:51 -06:00
  • 66d04ab5ca Merge pull request #406 from coralproject/asset-comment-metrics David Erwin 2017-03-14 17:16:15 -04:00
  • 6758a178eb Removing log David Erwin 2017-03-14 17:10:37 -04:00
  • 13dad0c895 Language update David Erwin 2017-03-14 17:07:48 -04:00
  • b4d236df36 Merge branch 'master' into asset-comment-metrics Riley Davis 2017-03-14 15:00:27 -06:00
  • 8876c10254 Merge pull request #407 from coralproject/hide-dashboard-cta Kim Gardner 2017-03-14 13:29:45 -04:00
  • c50d25c0e9 Merge branch 'master' into hide-dashboard-cta Kim Gardner 2017-03-14 13:19:23 -04:00
  • 1330ffd394 Merge pull request #410 from coralproject/firefox-mod-buttons Kim Gardner 2017-03-14 13:17:45 -04:00
  • d85473e20c Merge branch 'master' into firefox-mod-buttons Kim Gardner 2017-03-14 13:01:24 -04:00
  • 13e2766ae9 Merge pull request #413 from coralproject/reporting-messaging Kim Gardner 2017-03-14 13:00:49 -04:00
  • fa66bab937 Merge branch 'master' into asset-comment-metrics Riley Davis 2017-03-14 10:46:21 -06:00
  • f0eaf01ccc remove fakeurl Riley Davis 2017-03-13 13:33:31 -06:00
  • 147345505f indentation and flag -> report riley 2017-03-13 13:23:00 -06:00
  • b1f426e70d Merge branch 'master' into recaptcha-support riley 2017-03-13 12:27:19 -06:00
  • 7bfa718830 remove like widget for now riley 2017-03-13 12:15:38 -06:00
  • 801555e66e button text was wrapping in firefox riley 2017-03-13 12:08:57 -06:00
  • bf31f07053 Merge pull request #404 from coralproject/keyboard-shortcut-scroll Riley Davis 2017-03-13 11:52:08 -06:00
  • 6d3bb6af03 Merge branch 'master' into keyboard-shortcut-scroll Riley Davis 2017-03-13 11:14:04 -06:00
  • f999be6fbf scrollIntoView will work in more browsers Riley Davis 2017-03-13 11:13:28 -06:00
  • 15e962c985 Merge pull request #409 from coralproject/revert-version-pin David Erwin 2017-03-13 12:01:18 -04:00
  • 8e6c2e8075 Resolved #357 Wyatt Johnson 2017-03-13 09:43:47 -06:00
  • eb00320a0c Merge pull request #405 from coralproject/asset-comment-total-count David Erwin 2017-03-13 11:32:35 -04:00
  • 33062ca43e Merge branch 'master' into asset-comment-total-count David Erwin 2017-03-13 11:14:36 -04:00
  • cf753632bf Merge branch 'master' into asset-comment-metrics David Erwin 2017-03-13 10:18:57 -04:00
  • 5ceaa24217 Merge pull request #408 from coralproject/widen-notifications David Erwin 2017-03-13 10:18:28 -04:00
  • 9f5648b4c3 Merge branch 'master' into widen-notifications David Erwin 2017-03-13 10:14:51 -04:00
  • 087851f694 Merge pull request #403 from coralproject/bugfix-ban-dialog-language Riley Davis 2017-03-10 15:08:27 -07:00
  • e159435293 Merge branch 'master' into bugfix-ban-dialog-language Riley Davis 2017-03-10 14:50:49 -07:00
  • 9d9d336e06 make notifications wider Riley Davis 2017-03-10 13:54:33 -07:00
  • 9e7b710faa save dismissed timer note to localStorage Riley Davis 2017-03-10 13:48:14 -07:00
  • 4a10122f34 add some translations Riley Davis 2017-03-10 12:15:47 -07:00
  • 93221de563 Added support for total comment count Wyatt Johnson 2017-03-09 17:07:07 -07:00
  • 255807858d Scrolling to keep selected comments in view. David Jay 2017-03-09 18:06:44 -05:00
  • f6af847bfb add Activity widget Riley Davis 2017-03-09 16:05:09 -07:00
  • 25fe268872 Merge branch 'master' into asset-comment-metrics riley 2017-03-09 13:20:51 -07:00
  • 5893e0cbde Merge pull request #398 from coralproject/widget-auto-update Riley Davis 2017-03-09 13:19:39 -07:00
  • 0a88d3da97 Merge branch 'master' into widget-auto-update Riley Davis 2017-03-09 13:15:56 -07:00
  • d46b06da1c Merge pull request #401 from coralproject/remove-notification-warning Riley Davis 2017-03-09 13:01:37 -07:00
  • cb10de6c7a modify to light grey Riley Davis 2017-03-09 12:57:54 -07:00
  • 98a87f4595 Merge branch 'master' Riley Davis 2017-03-09 12:22:20 -07:00
  • 1884ad6437 Merge branch 'master' into bugfix-ban-dialog-language David Jay 2017-03-09 13:51:51 -05:00
  • 3c296ea4e9 Merge branch 'master' into remove-notification-warning David Jay 2017-03-09 13:51:21 -05:00
  • 82f47e27ac Merge pull request #396 from coralproject/open-closed-stream-buttons Riley Davis 2017-03-09 11:50:28 -07:00
  • 3232c04997 Merge branch 'master' into remove-notification-warning David Jay 2017-03-09 13:50:09 -05:00
  • e6dfb3f64a Merge branch 'master' into open-closed-stream-buttons Riley Davis 2017-03-09 11:44:47 -07:00
  • fb7895b02f Merge branch 'master' into widget-auto-update Riley Davis 2017-03-09 11:44:16 -07:00
  • a152b9f1d3 Merge pull request #392 from coralproject/mod-queue-load-more Riley Davis 2017-03-09 11:43:27 -07:00
  • 542ccc6190 Merge branch 'master' into bugfix-ban-dialog-language David Jay 2017-03-09 13:40:44 -05:00
  • 8f988c898d Merge branch 'mod-queue-load-more' of github.com:coralproject/talk into mod-queue-load-more David Jay 2017-03-09 13:36:59 -05:00
  • 66adf19b97 Merge branch 'master' into mod-queue-load-more David Jay 2017-03-09 13:36:37 -05:00
  • f24eb74745 Merge pull request #402 from coralproject/autoreject-on-ban David Jay 2017-03-09 13:35:10 -05:00
  • a0953c0689 Adding proptypes to loadmore component. David Jay 2017-03-09 13:33:00 -05:00
  • c3749c5e31 Merge branch 'master' into autoreject-on-ban Belén Curcio 2017-03-09 13:27:30 -05:00
  • ebdf4b5ec7 Merge branch 'master' into open-closed-stream-buttons David Erwin 2017-03-09 13:15:45 -05:00
  • 53043051f3 Merge branch 'master' into bugfix-ban-dialog-language David Erwin 2017-03-09 13:13:10 -05:00
  • a195879556 Merge branch 'master' into widget-auto-update David Erwin 2017-03-09 13:11:17 -05:00
  • b0ca4d0785 Merge pull request #400 from coralproject/flag-username-reset David Erwin 2017-03-09 13:10:31 -05:00
  • 39386a9fcf Merge branch 'master' into mod-queue-load-more David Jay 2017-03-09 13:07:41 -05:00
  • 0db92974c4 make only the title clickable Riley Davis 2017-03-09 11:05:18 -07:00
  • f64063ba14 Merge branch 'master' into flag-username-reset David Erwin 2017-03-09 12:57:09 -05:00
  • 91dff157aa Merge pull request #394 from coralproject/bugfix-mod-queue-refresh David Erwin 2017-03-09 12:55:24 -05:00
  • fd9f838948 Merge branch 'master' into open-closed-stream-buttons David Jay 2017-03-09 12:39:54 -05:00
  • db5df1699c Merge branch 'master' into autoreject-on-ban Riley Davis 2017-03-09 10:30:10 -07:00
  • c064bee4f6 Merge branch 'master' into flag-username-reset Riley Davis 2017-03-09 10:27:27 -07:00
  • 895d3c31fc Merge branch 'master' into bugfix-mod-queue-refresh Riley Davis 2017-03-09 10:24:25 -07:00
  • 070ed13495 Merge branch 'master' into mod-queue-load-more Riley Davis 2017-03-09 10:15:08 -07:00
  • 491694b9c1 Merge branch 'master' into story-138187767-mod-flag-names Gabriela Rodríguez Berón 2017-03-09 17:20:00 +01:00
  • 6a72f4d066 Merge pull request #397 from coralproject/long-titles Belén Curcio 2017-03-09 11:17:11 -05:00
  • 9bfc7d2037 Merge branch 'master' into long-titles Belén Curcio 2017-03-09 11:05:08 -05:00
  • 438877d58f Merge branch 'long-titles' of github.com:coralproject/talk into long-titles Belen Curcio 2017-03-09 11:03:37 -05:00
  • ce7a2d54d0 Font Size Belen Curcio 2017-03-09 10:59:28 -05:00
  • 63220cb6a7 Some fixes to make it work Wyatt Johnson 2017-03-08 19:14:02 -07:00
  • feaad2d6ca Added loader, graphql Wyatt Johnson 2017-03-08 19:01:08 -07:00
  • 9b53930861 Merge branch 'master' into flag-username-reset David Jay 2017-03-08 17:49:59 -05:00
  • 2cdf2bb332 add moderate button riley 2017-03-08 15:26:45 -07:00
  • 7bf5285a1d Merge branch 'master' into bugfix-ban-dialog-language David Jay 2017-03-08 17:10:14 -05:00
  • a8d090d5a2 Merge branch 'master' into autoreject-on-ban David Jay 2017-03-08 17:07:26 -05:00
  • 377563c798 Hiding rejected note on ban dialog for rejected comments. David Jay 2017-03-08 17:02:47 -05:00
  • f0b1460aa8 Merge pull request #399 from coralproject/mod-squad Riley Davis 2017-03-08 15:01:00 -07:00
  • 7b5721e0c6 Merged branch open-closed-stream-buttons into open-closed-stream-buttons Riley Davis 2017-03-08 15:00:09 -07:00
  • b34758e8cc unused vars Riley Davis 2017-03-08 14:59:55 -07:00
  • ee84b821fc Merge branch 'master' into mod-squad Riley Davis 2017-03-08 14:57:19 -07:00
  • c9e5b91b18 Merge branch 'master' into open-closed-stream-buttons Riley Davis 2017-03-08 14:53:24 -07:00
  • eaf035acd6 simplify dashboard table rendering Riley Davis 2017-03-08 14:51:50 -07:00
  • fac3d26c22 Closing ban dialog after ban is complete. David Jay 2017-03-08 16:39:53 -05:00
  • 5a50ae0d10 incorrectly using dispatch now that we do pym directly Riley Davis 2017-03-08 14:16:20 -07:00
  • c467460580 Merge pull request #393 from coralproject/banned-optimize-bug David Erwin 2017-03-08 16:16:06 -05:00
  • d203a9afe0 Auto-rejecting comments on ban. David Jay 2017-03-08 16:06:34 -05:00