Commit Graph

3586 Commits

Author SHA1 Message Date
gaba f5ef33d24e Ban Button with graphql mutation. 2017-03-01 12:57:12 -08:00
Wyatt Johnson 9fb0f2f241 Merge branch 'master' into yarn-docker 2017-03-01 13:55:04 -07:00
Wyatt Johnson fb96d432ee Moved action creation upstream 2017-03-01 13:51:32 -07:00
Wyatt Johnson 49477ead6a Fixed temp issue 2017-03-01 13:47:08 -07:00
Kim Gardner 09eb2edb32 Merge branch 'master' into bugfix-suspect-reporting 2017-03-01 15:44:51 -05:00
Kim Gardner 516a05eca0 Merge pull request #359 from coralproject/bugfix-premod-optimistic
Preventing premod comments from being posted optimistically.
2017-03-01 15:44:34 -05:00
Kim Gardner 58e803223f Merge branch 'master' into bugfix-suspect-reporting 2017-03-01 15:41:22 -05:00
Kim Gardner 285430e1ce Merge branch 'master' into bugfix-premod-optimistic 2017-03-01 15:40:52 -05:00
Kim Gardner fdb051c810 Merge pull request #354 from coralproject/admin-login-upgrade
Admin login upgrade - RIP Communicorn part deux
2017-03-01 15:39:03 -05:00
Kim Gardner 43d2b29921 Merge branch 'master' into admin-login-upgrade 2017-03-01 15:35:01 -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
Wyatt Johnson 2f05cec380 Removed yarn install (already has yarn!) 2017-03-01 11:50:32 -07:00
Wyatt Johnson eb8b733ac7 Merge branch 'master' into 138617379_best_comments 2017-03-01 11:46:04 -07:00
Wyatt Johnson f87525d0a4 Merge pull request #358 from coralproject/version-pin
Pinning to 7.6 until upstream issues resolved
2017-03-01 11:43:30 -07:00
Kim Gardner e56a04abf1 Merge branch 'master' into admin-login-upgrade 2017-03-01 13:42:56 -05:00
Riley Davis 4e5bcbc27f even more design updates 2017-03-01 11:42:03 -07:00
Wyatt Johnson af8c926296 Pinning to 7.6 until upstream issues resolved, see #357 2017-03-01 11:37:29 -07:00
Kim Gardner 4b39587837 Merge pull request #356 from coralproject/make-links-less-linky
Make links less linky
2017-03-01 13:31:44 -05:00
Kim Gardner 70c69e3752 Merge branch 'master' into make-links-less-linky 2017-03-01 13:27:13 -05:00
riley b346083d11 Merged master into admin-login-upgrade 2017-03-01 11:19:48 -07:00
Kim Gardner 23917944b2 Merge pull request #353 from coralproject/bugfix-user-state
Refetching on login and logout.
2017-03-01 13:14:26 -05:00
Riley Davis 00b2bf37ee fix height of the table 2017-03-01 11:14:13 -07:00
David Jay 3b04dab0d5 Merge branch 'master' into bugfix-user-state 2017-03-01 12:57:40 -05:00
Wyatt Johnson 45b14d026d Added more conditional checks to exclusion 2017-03-01 10:49:47 -07:00
Riley Davis bbf70aedab put it back to 5 minutes 2017-03-01 10:47:31 -07:00
Riley Davis 045fa3e2a9 also ignore this 2017-03-01 10:42:01 -07:00
Riley Davis 58870e1630 Merged branch master into admin-login-upgrade 2017-03-01 10:40:51 -07:00
Riley Davis 04ab00d053 ignore this 2017-03-01 10:40:40 -07:00
Riley Davis 1f70a2d3eb Merged branch master into make-links-less-linky 2017-03-01 10:37:50 -07:00
Riley Davis 674585adeb design updates 2017-03-01 10:37:39 -07:00
Wyatt Johnson 69deba245a Merge branch 'master' into 138617379_best_comments 2017-03-01 10:32:57 -07:00
Wyatt Johnson 74c457a0b0 Merge pull request #349 from coralproject/production-mode
Routes Production mode
2017-03-01 09:58:53 -07:00
Wyatt Johnson 79296999c0 Merge branch 'master' into production-mode 2017-03-01 09:52:46 -07:00
Wyatt Johnson a1e2077ef1 Merge branch 'master' into 138617379_best_comments 2017-03-01 09:43:44 -07:00
Kim Gardner a984fc9beb Merge pull request #355 from coralproject/comment-component
UX Comment Component
2017-03-01 11:03:54 -05:00
Belen Curcio 6cd0c12ba4 tweaks 2017-03-01 12:35:59 -03:00
Belen Curcio 545410b27e renaming duplicate statement 2017-03-01 11:50:05 -03:00
Belen Curcio 453894be80 Merge 2017-03-01 11:46:28 -03:00
Belen Curcio ea0602b7a5 Design Comment Component 2017-03-01 11:42:08 -03:00
Belen Curcio c33ae1f7f8 Merge branch 'master' of github.com:coralproject/talk into comment-component 2017-03-01 11:08:46 -03:00
Kim Gardner 87dddaf5b3 Merge branch 'master' into admin-login-upgrade 2017-03-01 09:01:15 -05:00
Kim Gardner 0af08fcaea Merge pull request #352 from coralproject/fix-permalink
Fix permalink
2017-03-01 09:00:59 -05:00
Kim Gardner 945e576ce7 Merge branch 'master' into fix-permalink 2017-03-01 08:57:17 -05:00
Benjamin Goering 5cb522c419 Merge branch 'master' into 138617379_best_comments 2017-03-01 20:49:04 +08:00
Benjamin Goering ab70ac38fd If fail to addremov best comment tag, show user an error 2017-03-01 16:07:25 +08:00
Benjamin Goering 90730e52be Make all comment action buttons use cursor:pointer and nowrap (sam said ok) 2017-03-01 15:02:49 +08:00
Benjamin Goering 5e0d01a649 lift findById out of add,removeCommentTag mutators and into root_mutation.js defs 2017-03-01 14:15:31 +08:00
gaba 6dfd3fc4ef Fix the people tag. 2017-02-28 22:10:14 -08:00
Benjamin Goering b0036ef778 Remove findById in error conditions of CommentsService@addTag,removeTag 2017-03-01 14:09:03 +08:00