Commit Graph

  • a984fc9beb Merge pull request #355 from coralproject/comment-component Kim Gardner 2017-03-01 11:03:54 -05:00
  • 6cd0c12ba4 tweaks Belen Curcio 2017-03-01 12:35:59 -03:00
  • 545410b27e renaming duplicate statement Belen Curcio 2017-03-01 11:50:05 -03:00
  • 453894be80 Merge Belen Curcio 2017-03-01 11:46:28 -03:00
  • ea0602b7a5 Design Comment Component Belen Curcio 2017-03-01 11:42:08 -03:00
  • c33ae1f7f8 Merge branch 'master' of github.com:coralproject/talk into comment-component Belen Curcio 2017-03-01 11:08:46 -03:00
  • 87dddaf5b3 Merge branch 'master' into admin-login-upgrade Kim Gardner 2017-03-01 09:01:15 -05:00
  • 0af08fcaea Merge pull request #352 from coralproject/fix-permalink Kim Gardner 2017-03-01 09:00:59 -05:00
  • 945e576ce7 Merge branch 'master' into fix-permalink Kim Gardner 2017-03-01 08:57:17 -05:00
  • 5cb522c419 Merge branch 'master' into 138617379_best_comments Benjamin Goering 2017-03-01 20:49:04 +08:00
  • ab70ac38fd If fail to addremov best comment tag, show user an error Benjamin Goering 2017-03-01 16:07:25 +08:00
  • 90730e52be Make all comment action buttons use cursor:pointer and nowrap (sam said ok) Benjamin Goering 2017-03-01 14:56:44 +08:00
  • 5e0d01a649 lift findById out of add,removeCommentTag mutators and into root_mutation.js defs Benjamin Goering 2017-03-01 14:15:31 +08:00
  • 6dfd3fc4ef Fix the people tag. gaba 2017-02-28 22:10:14 -08:00
  • b0036ef778 Remove findById in error conditions of CommentsService@addTag,removeTag Benjamin Goering 2017-03-01 14:09:03 +08:00
  • 4b2cc72e1a Remove unnecessary defensive code in CommentsService Benjamin Goering 2017-03-01 14:01:12 +08:00
  • 405dac292c Only transform-async-to-generator for client code. Allows async to work with mocha tests (if proper node version) Benjamin Goering 2017-03-01 13:43:39 +08:00
  • da3c812dc1 Adds graphql for users flagged in the server and client. gaba 2017-02-28 21:33:01 -08:00
  • 388c3182ea Change add,removeTag in CommentsService to use simpler query then elemMatch Benjamin Goering 2017-03-01 13:08:36 +08:00
  • 378622f7e8 commentTag mutation tests await SettingsService Benjamin Goering 2017-03-01 12:46:35 +08:00
  • 42b380b942 Flag box Belen Curcio 2017-02-28 22:35:37 -03:00
  • 339aefa72a Merge branch 'master' of github.com:coralproject/talk into comment-component Belen Curcio 2017-02-28 21:26:57 -03:00
  • 7ccf77b1ad add reset password link riley 2017-02-28 17:10:51 -07:00
  • cc9de0b02c Merge pull request #348 from coralproject/whizard-whitelist Belén Curcio 2017-02-28 21:06:16 -03:00
  • dc81ec1e80 Merge branch 'whizard-whitelist' of github.com:coralproject/talk into whizard-whitelist Belen Curcio 2017-02-28 20:44:55 -03:00
  • 1db0a75010 Merge Belen Curcio 2017-02-28 20:42:03 -03:00
  • 1f3eb5f516 Merged branch master into admin-login-upgrade Riley Davis 2017-02-28 16:31:49 -07:00
  • 8f23ca678d add Alert component to coral-ui riley 2017-02-28 16:30:05 -07:00
  • 230488117f Merge branch 'master' into bugfix-user-state David Jay 2017-02-28 18:20:00 -05:00
  • d8117494d1 Cleaning up after merge conflict. David Jay 2017-02-28 18:18:17 -05:00
  • e6b7098a6c Merge branch 'master' into production-mode Wyatt Johnson 2017-02-28 16:10:27 -07:00
  • e68358a211 Merge branch 'master' into fix-permalink David Jay 2017-02-28 18:07:31 -05:00
  • 7bd9411e73 Merge pull request #332 from coralproject/assets-by-like Kim Gardner 2017-02-28 16:57:47 -05:00
  • b369fb9101 re-rename Riley Davis 2017-02-28 14:38:19 -07:00
  • bb1aea63ba add a couple of routes Riley Davis 2017-02-28 14:33:57 -07:00
  • e2273f5810 change PermissionRequired to LoginView and create a login form. delete old login page Riley Davis 2017-02-28 14:32:01 -07:00
  • fed28b3eec Refetching on login and logout. David Jay 2017-02-28 16:13:51 -05:00
  • 037f5be377 Merge branch 'master' of github.com:coralproject/talk into fix-permalink David Jay 2017-02-28 14:28:32 -05:00
  • 62fe63d323 Scrolling to permalinked comment or reply. David Jay 2017-02-28 14:27:53 -05:00
  • 158f31d603 Highlighting permalinked comment. David Jay 2017-02-28 13:55:28 -05:00
  • c6885c8f1c Merge branch 'master' into assets-by-like Riley Davis 2017-02-28 11:16:26 -07:00
  • 86a6b545cc create a fragment for asset metrics. add some comments Riley Davis 2017-02-28 11:15:44 -07:00
  • 1db68a12a8 Merge branch 'master' into whizard-whitelist Gabriela Rodríguez Berón 2017-02-28 09:54:39 -08:00
  • 65e8e42ae6 remove query from Dashboard component per belen's advice Riley Davis 2017-02-28 10:51:14 -07:00
  • b3b10efbba Use tú to match other translations Kim Gardner 2017-02-28 12:35:20 -05:00
  • 3bfde67d58 Copy updates with translations Kim Gardner 2017-02-28 12:32:51 -05:00
  • cdbc065c90 Merge pull request #351 from coralproject/mod-queue-sort Kim Gardner 2017-02-28 12:22:41 -05:00
  • b9297b6079 Merge branch 'master' into mod-queue-sort David Jay 2017-02-28 12:11:05 -05:00
  • 95a9259c06 Fixing bug with mod queue sorting. David Jay 2017-02-28 12:06:27 -05:00
  • bf23fc2974 Moving comment id into query. David Jay 2017-02-28 12:02:51 -05:00
  • ac3e6a12bd Merge branch 'master' into assets-by-like Riley Davis 2017-02-28 09:27:46 -07:00
  • d6167e10ba Revert ALLOWED_TAGS declaration to be arr of objects, not strings Benjamin Goering 2017-02-28 23:57:35 +08:00
  • 32152fee7e add newline that eslint wants Benjamin Goering 2017-02-28 23:56:53 +08:00
  • 3a2f893c24 eslintrc.json doesn't use babel-eslint parser, but does set ecmaVersion to 2017 Benjamin Goering 2017-02-28 23:46:02 +08:00
  • 97ebb66f8c Remove @TODOs I don't care about Benjamin Goering 2017-02-28 20:09:24 +08:00
  • 061efd4734 Comment Component Design Belen Curcio 2017-02-28 09:03:19 -03:00
  • d9df38fc3a fix e2e tests with .comment selector that avoids hidden dialog Benjamin Goering 2017-02-28 19:31:13 +08:00
  • f8479a8661 fix e2e tests with .comment selector that avoids hidden dialog Benjamin Goering 2017-02-28 19:30:25 +08:00
  • fe8cf2c612 Style multiple tag labels and material-icon therein (edited dist/../default.css before :/) Benjamin Goering 2017-02-28 18:57:27 +08:00
  • 96d1447602 remove debugging code from embedStreamPage Benjamin Goering 2017-02-28 17:27:19 +08:00
  • af23717988 Indicate best comments. Add some aria labels Benjamin Goering 2017-02-28 17:19:11 +08:00
  • c2d199a21c Remove BestButton copy for now Benjamin Goering 2017-02-28 16:28:23 +08:00
  • c6df602b94 Remove cursor: pointer from BestButton for now. And remove unneeded container Benjamin Goering 2017-02-28 16:26:15 +08:00
  • 51452a6b33 Comment component passes addTag,removeTag to its replies' Comments Benjamin Goering 2017-02-28 16:17:48 +08:00
  • 7e3c5820dc BestButton is disabled while its saving Benjamin Goering 2017-02-28 16:08:30 +08:00
  • bce84f24fd Embed can remove best tag Benjamin Goering 2017-02-28 15:55:19 +08:00
  • 98f3033326 Add permission checking to addCommentTag,removeCommentTag Benjamin Goering 2017-02-28 15:30:48 +08:00
  • 30ee80b12c basic working removeCommentTag mutation Benjamin Goering 2017-02-28 15:02:02 +08:00
  • 4ff6bce8ec Add ComentsService#removeTag Benjamin Goering 2017-02-28 14:49:51 +08:00
  • 1bb20923a2 Fix Commenter/BestCommentTest to postComment before checking things. Benjamin Goering 2017-02-28 13:49:57 +08:00
  • 6e338290a1 addCommentTag mutation works Benjamin Goering 2017-02-28 02:31:02 +08:00
  • fc9c67b05c BestButton sends mutations to backend, but they aren't implemented yet Benjamin Goering 2017-02-27 21:24:56 +08:00
  • 907c4526da BestButton only shows if currentUser can use it (and e2e) Benjamin Goering 2017-02-27 20:30:16 +08:00
  • a26a60cc67 minial best button uionly and e2e Benjamin Goering 2017-02-27 19:16:27 +08:00
  • 87d64e575b Merge branch 'master' into whizard-whitelist Wyatt Johnson 2017-02-27 15:52:16 -07:00
  • aa88eb2374 Adjusted build process Wyatt Johnson 2017-02-27 15:33:52 -07:00
  • 6cd3c84853 Moved route definitions into env wrapped check, webpackified embed Wyatt Johnson 2017-02-27 14:21:48 -07:00
  • 303148e5ba Merge pull request #345 from coralproject/bugfix-second-new-comments David Jay 2017-02-27 15:34:40 -05:00
  • 95876fa0e8 Merge branch 'master' of github.com:coralproject/talk into whizard-whitelist Belen Curcio 2017-02-27 17:19:54 -03:00
  • 555faa02f5 new translations for configure Belen Curcio 2017-02-27 17:18:37 -03:00
  • 1234a99a0d copy for install permitted domains updated Belen Curcio 2017-02-27 17:16:19 -03:00
  • b9e9d3e7fa status Belen Curcio 2017-02-27 17:06:22 -03:00
  • 628e8844f3 final translations Belen Curcio 2017-02-27 17:04:14 -03:00
  • b47fd35437 add user translations Belen Curcio 2017-02-27 16:58:16 -03:00
  • 1b495b9b09 Merge branch 'master' into bugfix-second-new-comments David Jay 2017-02-27 14:57:24 -05:00
  • 373d0de576 Merge pull request #346 from coralproject/mod-queue-sort David Jay 2017-02-27 14:57:09 -05:00
  • 7341fdff4e add Organization translations Belen Curcio 2017-02-27 16:54:03 -03:00
  • 1e52c579cc Ínitial translations Belen Curcio 2017-02-27 16:50:04 -03:00
  • 013625df27 no validation for domains Belen Curcio 2017-02-27 16:39:52 -03:00
  • ab16e5bfe7 Retrieving comment y id from backend David Jay 2017-02-27 14:26:20 -05:00
  • dfd211deda Merge branch 'master' into mod-queue-sort David Jay 2017-02-27 14:05:04 -05:00
  • 9305853502 Renamed to PermittedDomains Belen Curcio 2017-02-27 15:50:07 -03:00
  • b1ec512721 Adding whitelist step, sending whitelist Belen Curcio 2017-02-27 14:42:57 -03:00
  • ca4b03872b Merge branch 'master' into story-138187767-mod-flag-names gaba 2017-02-27 09:39:52 -08:00
  • 83e713d889 Merge branch 'master' into bugfix-second-new-comments David Jay 2017-02-27 12:34:11 -05:00
  • a47e2378e9 Merge pull request #331 from coralproject/dont-agree David Jay 2017-02-27 12:32:56 -05:00
  • 491f254206 Merge branch 'mod-queue-sort' of github.com:coralproject/talk into mod-queue-sort David Jay 2017-02-27 12:30:04 -05:00
  • 2b22ce076c Merge branch 'master' into mod-queue-sort David Jay 2017-02-27 12:29:42 -05:00
  • 22793c02e2 Merge branch 'master' into dont-agree David Jay 2017-02-27 12:29:19 -05:00
  • 37b08fd4e4 Displaying oldest first by default. David Jay 2017-02-27 12:28:13 -05:00