 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 |
|
|
Benjamin Goering
|
4b2cc72e1a
|
Remove unnecessary defensive code in CommentsService
|
2017-03-01 14:01:12 +08:00 |
|
|
Benjamin Goering
|
405dac292c
|
Only transform-async-to-generator for client code. Allows async to work with mocha tests (if proper node version)
|
2017-03-01 13:43:39 +08:00 |
|
|
gaba
|
da3c812dc1
|
Adds graphql for users flagged in the server and client.
|
2017-02-28 21:33:01 -08:00 |
|
|
Benjamin Goering
|
388c3182ea
|
Change add,removeTag in CommentsService to use simpler query then elemMatch
|
2017-03-01 13:08:36 +08:00 |
|
|
Benjamin Goering
|
378622f7e8
|
commentTag mutation tests await SettingsService
|
2017-03-01 12:46:35 +08:00 |
|
|
Belen Curcio
|
42b380b942
|
Flag box
|
2017-02-28 22:35:37 -03:00 |
|
|
Belen Curcio
|
339aefa72a
|
Merge branch 'master' of github.com:coralproject/talk into comment-component
|
2017-02-28 21:26:57 -03:00 |
|
|
riley
|
7ccf77b1ad
|
add reset password link
|
2017-02-28 17:10:51 -07:00 |
|
|
Belén Curcio
|
cc9de0b02c
|
Merge pull request #348 from coralproject/whizard-whitelist
Permitted Domains for Talk Install
|
2017-02-28 21:06:16 -03:00 |
|
|
Belen Curcio
|
dc81ec1e80
|
Merge branch 'whizard-whitelist' of github.com:coralproject/talk into whizard-whitelist
|
2017-02-28 20:44:55 -03:00 |
|
|
Belen Curcio
|
1db0a75010
|
Merge
|
2017-02-28 20:42:03 -03:00 |
|
|
Riley Davis
|
1f3eb5f516
|
Merged branch master into admin-login-upgrade
|
2017-02-28 16:31:49 -07:00 |
|
|
riley
|
8f23ca678d
|
add Alert component to coral-ui
|
2017-02-28 16:31:30 -07:00 |
|
|
David Jay
|
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 |
|
|
Wyatt Johnson
|
e6b7098a6c
|
Merge branch 'master' into production-mode
|
2017-02-28 16:10:27 -07:00 |
|
|
David Jay
|
e68358a211
|
Merge branch 'master' into fix-permalink
|
2017-02-28 18:07:31 -05:00 |
|
|
Kim Gardner
|
7bd9411e73
|
Merge pull request #332 from coralproject/assets-by-like
Dashboard: Articles with most likes, articles with most flags
|
2017-02-28 16:57:47 -05:00 |
|
|
Riley Davis
|
b369fb9101
|
re-rename
|
2017-02-28 14:38:19 -07:00 |
|
|
Riley Davis
|
bb1aea63ba
|
add a couple of routes
|
2017-02-28 14:33:57 -07:00 |
|
|
Riley Davis
|
e2273f5810
|
change PermissionRequired to LoginView and create a login form. delete old login page
|
2017-02-28 14:32:01 -07: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 |
|
|
Riley Davis
|
c6885c8f1c
|
Merge branch 'master' into assets-by-like
|
2017-02-28 11:16:26 -07:00 |
|
|
Riley Davis
|
86a6b545cc
|
create a fragment for asset metrics. add some comments
|
2017-02-28 11:15:44 -07:00 |
|
|
Gabriela Rodríguez Berón
|
1db68a12a8
|
Merge branch 'master' into whizard-whitelist
|
2017-02-28 09:54:39 -08:00 |
|
|
Riley Davis
|
65e8e42ae6
|
remove query from Dashboard component per belen's advice
|
2017-02-28 10:51:14 -07:00 |
|
|
Kim Gardner
|
b3b10efbba
|
Use tú to match other translations
|
2017-02-28 12:35:20 -05:00 |
|
|
Kim Gardner
|
3bfde67d58
|
Copy updates with translations
|
2017-02-28 12:32:51 -05:00 |
|
|
Kim Gardner
|
cdbc065c90
|
Merge pull request #351 from coralproject/mod-queue-sort
Fixing order bug with mod queue sorting.
|
2017-02-28 12:22:41 -05:00 |
|
|
David Jay
|
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 |
|
|
Riley Davis
|
ac3e6a12bd
|
Merge branch 'master' into assets-by-like
|
2017-02-28 09:27:46 -07:00 |
|
|
Benjamin Goering
|
d6167e10ba
|
Revert ALLOWED_TAGS declaration to be arr of objects, not strings
|
2017-02-28 23:57:35 +08:00 |
|
|
Benjamin Goering
|
32152fee7e
|
add newline that eslint wants
|
2017-02-28 23:56:53 +08:00 |
|
|
Benjamin Goering
|
3a2f893c24
|
eslintrc.json doesn't use babel-eslint parser, but does set ecmaVersion to 2017
|
2017-02-28 23:46:02 +08:00 |
|
|
Benjamin Goering
|
97ebb66f8c
|
Remove @TODOs I don't care about
|
2017-02-28 20:09:24 +08:00 |
|
|
Belen Curcio
|
061efd4734
|
Comment Component Design
|
2017-02-28 09:03:19 -03:00 |
|