Commit Graph

5249 Commits

Author SHA1 Message Date
Kim Gardner fefbec032c Merge pull request #790 from coralproject/commentsid
Search Comment in an Asset
2017-07-25 10:19:33 -04:00
Kim Gardner 788a35d9bb Merge branch 'master' into commentsid 2017-07-25 10:12:23 -04:00
Kim Gardner fc1b69681e Merge pull request #772 from coralproject/next
Generate and integrate introspection query results
2017-07-25 10:12:12 -04:00
Kim Gardner 1077bfbec2 Merge branch 'master' into next 2017-07-25 10:07:13 -04:00
Kim Gardner 9b5bbe9971 Merge pull request #791 from coralproject/bump-version-3-0-0
Update version to 3.0.0
2017-07-25 10:06:41 -04:00
Kim Gardner 00597378d6 Merge branch 'master' into bump-version-3-0-0 2017-07-25 10:01:14 -04:00
Kim Gardner 3bb0370a5a Merge pull request #797 from coralproject/jwt-alg
JWT Changes
2017-07-25 10:01:00 -04:00
Chi Vinh Le d9049ab602 Merge branch 'commentsid' of ssh://github.com/coralproject/talk into commentsid 2017-07-25 19:16:01 +07:00
Chi Vinh Le ef759e068b Adapt query helpers 2017-07-25 19:14:03 +07:00
Chi Vinh Le f10d1a9f0d Adapt auto scroll when loading a permalinked comment 2017-07-25 19:11:11 +07:00
Kiwi 374b99ddc2 Merge branch 'master' into commentsid 2017-07-25 12:55:24 +02:00
Kiwi f60e580f14 Merge branch 'master' into next 2017-07-25 12:17:50 +02:00
Chi Vinh Le 0c05da9285 Add comment 2017-07-25 17:16:59 +07:00
Chi Vinh Le b4244b8671 More integration with the introspection query result
- Auto generate introspection on any change when using  `dev-start`
- Port client to use introspection matcher
2017-07-25 16:51:41 +07:00
Wyatt Johnson 4d6271d255 Added log about result 2017-07-25 17:31:28 +10:00
Wyatt Johnson 2e74e2fe62 Added introspection results to build pipeline 2017-07-25 17:29:51 +10:00
Wyatt Johnson 3f304823ca Added new config for jwt alg + added query parsing of access token 2017-07-25 15:55:40 +10:00
Wyatt Johnson 0c8def722b Refined task singleton to factory 2017-07-25 12:53:52 +10:00
Belén Curcio 34e484abf3 Merge pull request #795 from coralproject/plugin-seed-fix
Fix for the plugin seed builder
2017-07-24 23:48:43 -03:00
Wyatt Johnson 07114aed1b removed unused var 2017-07-25 12:40:54 +10:00
Wyatt Johnson f13e6b0e16 Fixes to impl 2017-07-25 12:38:49 +10:00
Wyatt Johnson c2f6b9aa09 Suggestions for refactoring 2017-07-25 12:32:15 +10:00
Belen Curcio fac63099c7 Using path.resolve instead 2017-07-24 23:26:18 -03:00
Belen Curcio 3a7353e4fe fix for plugin seed builder 2017-07-24 23:15:30 -03:00
Wyatt Johnson aeeafb6284 Merge branch 'master' into next 2017-07-25 11:52:53 +10:00
Wyatt Johnson c3bb399782 Merge branch 'master' into commentsid 2017-07-25 11:52:17 +10:00
Wyatt Johnson 2af0a2309e Merge branch 'master' into bump-version-3-0-0 2017-07-25 11:52:12 +10:00
Andrew Losowsky ef5e70f179 Merge pull request #793 from coralproject/remove-cache
Removed yarn cache
2017-07-24 21:51:49 -04:00
Wyatt Johnson b8bd997fed removed yarn cache 2017-07-25 11:39:36 +10:00
Kim Gardner 712c7e2ad2 Merge branch 'master' into commentsid 2017-07-24 21:22:03 -04:00
Kim Gardner 6c43a8accd Merge branch 'master' into bump-version-3-0-0 2017-07-24 21:21:54 -04:00
Wyatt Johnson 9e1d22b988 Merge pull request #792 from coralproject/version-bump
Bumped node version, replaced bcrypt -> bcryptjs
2017-07-25 11:20:56 +10:00
Wyatt Johnson 9ffe542234 added some forcing logic to circle 2017-07-25 10:51:29 +10:00
Wyatt Johnson e292475f1e Added yarn global add node-gyp back 2017-07-25 10:20:54 +10:00
Wyatt Johnson c8f3be4bf5 fixed docker version number 2017-07-25 10:03:50 +10:00
Wyatt Johnson 3e09d28308 Bumped node version, replaced bcrypt -> bcryptjs 2017-07-25 10:01:05 +10:00
Kim Gardner be46ac826b Update version to 3.0.0 2017-07-24 16:51:35 -04:00
Belen Curcio a036a051cb Using async await 2017-07-24 16:40:08 -03:00
Belen Curcio 36df7cb784 Extended Asset with comment 2017-07-24 16:31:24 -03:00
Belen Curcio 4b74c3312f typo 2017-07-24 15:36:00 -03:00
Wyatt Johnson 7e917c9611 Merge branch 'master' into next 2017-07-23 18:35:53 -06:00
Kim Gardner db183124c9 Merge pull request #787 from coralproject/long-title
Fix for long titles in the All Streams Queue
v2.5.0
2017-07-21 21:18:44 -04:00
Kim Gardner ee220ca936 Merge branch 'master' into long-title 2017-07-21 21:13:24 -04:00
Kim Gardner 907e9bf226 Merge pull request #786 from coralproject/featured-comments-info
Featured Comments Tooltips
2017-07-21 15:18:15 -04:00
Belen Curcio 25bccde40f fix 2017-07-21 16:08:18 -03:00
Belen Curcio 6343a0d621 Adding tooltip to badges too 2017-07-21 16:01:43 -03:00
Kim Gardner 6e6caaf5a9 Merge pull request #782 from coralproject/post-comment-no-alias
Remove remaining username alias in post comment mutation
2017-07-21 09:35:58 -04:00
Kim Gardner 8261c40c8d Merge branch 'master' into post-comment-no-alias 2017-07-21 09:31:01 -04:00
Kim Gardner 316b0a8808 Merge pull request #781 from coralproject/featured-tag-on-replies
Show featured tag on replies too
2017-07-21 09:30:45 -04:00
Kim Gardner ebce930b8c Merge branch 'master' into featured-tag-on-replies 2017-07-21 09:19:21 -04:00