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 JayandGitHub
|
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 JohnsonandGitHub
|
e6b7098a6c
|
Merge branch 'master' into production-mode
|
2017-02-28 16:10:27 -07:00 |
|
 David JayandGitHub
|
e68358a211
|
Merge branch 'master' into fix-permalink
|
2017-02-28 18:07:31 -05:00 |
|
 Kim GardnerandGitHub
|
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 DavisandGitHub
|
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ónandGitHub
|
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 GardnerandGitHub
|
b3b10efbba
|
Use tú to match other translations
|
2017-02-28 12:35:20 -05:00 |
|
 Kim GardnerandGitHub
|
3bfde67d58
|
Copy updates with translations
|
2017-02-28 12:32:51 -05:00 |
|
 Kim GardnerandGitHub
|
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 JayandGitHub
|
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 DavisandGitHub
|
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 |
|
Benjamin Goering
|
d9df38fc3a
|
fix e2e tests with .comment selector that avoids hidden dialog
|
2017-02-28 20:00:41 +08:00 |
|
Benjamin Goering
|
f8479a8661
|
fix e2e tests with .comment selector that avoids hidden dialog
|
2017-02-28 20:00:41 +08:00 |
|
Benjamin Goering
|
fe8cf2c612
|
Style multiple tag labels and material-icon therein (edited dist/../default.css before :/)
|
2017-02-28 19:59:35 +08:00 |
|
Benjamin Goering
|
96d1447602
|
remove debugging code from embedStreamPage
|
2017-02-28 19:59:35 +08:00 |
|
Benjamin Goering
|
af23717988
|
Indicate best comments. Add some aria labels
|
2017-02-28 19:59:34 +08:00 |
|
Benjamin Goering
|
c2d199a21c
|
Remove BestButton copy for now
|
2017-02-28 19:59:34 +08:00 |
|
Benjamin Goering
|
c6df602b94
|
Remove cursor: pointer from BestButton for now. And remove unneeded container
|
2017-02-28 19:59:34 +08:00 |
|
Benjamin Goering
|
51452a6b33
|
Comment component passes addTag,removeTag to its replies' Comments
|
2017-02-28 19:59:34 +08:00 |
|
Benjamin Goering
|
7e3c5820dc
|
BestButton is disabled while its saving
|
2017-02-28 19:59:33 +08:00 |
|
Benjamin Goering
|
bce84f24fd
|
Embed can remove best tag
|
2017-02-28 19:59:33 +08:00 |
|
Benjamin Goering
|
98f3033326
|
Add permission checking to addCommentTag,removeCommentTag
|
2017-02-28 19:59:33 +08:00 |
|
Benjamin Goering
|
30ee80b12c
|
basic working removeCommentTag mutation
|
2017-02-28 19:59:33 +08:00 |
|
Benjamin Goering
|
4ff6bce8ec
|
Add ComentsService#removeTag
|
2017-02-28 19:59:33 +08:00 |
|
Benjamin Goering
|
1bb20923a2
|
Fix Commenter/BestCommentTest to postComment before checking things.
|
2017-02-28 19:59:32 +08:00 |
|
Benjamin Goering
|
6e338290a1
|
addCommentTag mutation works
|
2017-02-28 19:59:32 +08:00 |
|
Benjamin Goering
|
fc9c67b05c
|
BestButton sends mutations to backend, but they aren't implemented yet
|
2017-02-28 19:59:32 +08:00 |
|
Benjamin Goering
|
907c4526da
|
BestButton only shows if currentUser can use it (and e2e)
|
2017-02-28 19:57:50 +08:00 |
|
Benjamin Goering
|
a26a60cc67
|
minial best button uionly and e2e
|
2017-02-28 19:57:50 +08:00 |
|
 Wyatt JohnsonandGitHub
|
87d64e575b
|
Merge branch 'master' into whizard-whitelist
|
2017-02-27 15:52:16 -07:00 |
|
Wyatt Johnson
|
aa88eb2374
|
Adjusted build process
|
2017-02-27 15:33:52 -07:00 |
|