 Wyatt JohnsonandGitHub
|
eb8b733ac7
|
Merge branch 'master' into 138617379_best_comments
|
2017-03-01 11:46:04 -07:00 |
|
|
Wyatt JohnsonandGitHub
|
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 |
|
|
Wyatt Johnson
|
af8c926296
|
Pinning to 7.6 until upstream issues resolved, see #357
|
2017-03-01 11:37:29 -07:00 |
|
|
Kim GardnerandGitHub
|
4b39587837
|
Merge pull request #356 from coralproject/make-links-less-linky
Make links less linky
|
2017-03-01 13:31:44 -05:00 |
|
|
Kim GardnerandGitHub
|
70c69e3752
|
Merge branch 'master' into make-links-less-linky
|
2017-03-01 13:27:13 -05:00 |
|
|
Kim GardnerandGitHub
|
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 JayandGitHub
|
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
|
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 JohnsonandGitHub
|
69deba245a
|
Merge branch 'master' into 138617379_best_comments
|
2017-03-01 10:32:57 -07:00 |
|
|
Wyatt JohnsonandGitHub
|
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 JohnsonandGitHub
|
a1e2077ef1
|
Merge branch 'master' into 138617379_best_comments
|
2017-03-01 09:43:44 -07:00 |
|
|
Kim GardnerandGitHub
|
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 GardnerandGitHub
|
0af08fcaea
|
Merge pull request #352 from coralproject/fix-permalink
Fix permalink
|
2017-03-01 09:00:59 -05:00 |
|
|
Kim GardnerandGitHub
|
945e576ce7
|
Merge branch 'master' into fix-permalink
|
2017-03-01 08:57:17 -05:00 |
|
|
Benjamin GoeringandGitHub
|
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 |
|
|
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 |
|
|
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 |
|
|
Belén CurcioandGitHub
|
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 |
|
|
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 |
|
|
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 |
|