diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 72c75ce27..94e2be437 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,10 +10,11 @@ By contributing to this project you agree to the [Code of Conduct](https://coral You can view what the Coral Team is working on next here https://www.pivotaltracker.com/n/projects/1863625. -You can view product ideas and our longer term roadmap here https://trello.com/b/ILND751a/talk. +If you'd like to see our longer term roadmap, [get in touch.](https://coralproject.net/contact.html) ## Contribute to the documentation + Clear docs are a prerequisite for a successful open source project. We value non-code and code contributions equally. We are looking for _documentarians_ to: @@ -55,7 +56,7 @@ Please [contact us](https://github.com/coralproject/talk/wiki/Contact-Us) early To get an idea of where the Coral Team is going, see: -* our [product/design Trello board](https://trello.com/b/ILND751a/talk), +* our [Slack channel](https://coralprojectslackin.herokuapp.com/), where you can talk directly with the Team and other community members, * our [current stories](https://www.pivotaltracker.com/n/projects/1863625), and * our [issues](https://github.com/coralproject/talk/issues). diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css index 6a6a2214d..2ef617593 100644 --- a/client/coral-embed-stream/style/default.css +++ b/client/coral-embed-stream/style/default.css @@ -11,7 +11,7 @@ html, body { } body { - font-family: 'Lato', sans-serif; + font-family: Helvetica, 'Helvetica Neue', Verdana, sans-serif; width: 100%; font-size: 14px; margin: 0px; diff --git a/plugins.js b/plugins.js index 2455e430f..02cdb58e1 100644 --- a/plugins.js +++ b/plugins.js @@ -3,9 +3,10 @@ const path = require('path'); const resolve = require('resolve'); const debug = require('debug')('talk:plugins'); const Joi = require('joi'); +const amp = require('app-module-path'); -// Add support for require rewriting. -require('app-module-path').addPath(__dirname); +// Add the current path to the module root. +amp.addPath(__dirname); let plugins = {}; @@ -35,6 +36,9 @@ try { } } +/** + * All the hooks from plugins must match the schema defined here. + */ const hookSchemas = { passport: Joi.func().arity(1), router: Joi.func().arity(1), @@ -82,6 +86,12 @@ function pluginPath(name) { } } +/** + * Itterates over the plugins and gets the plugin path's, version, and name. + * + * @param {Array} plugins + * @returns {Array} + */ function itteratePlugins(plugins) { return plugins.map((p) => { let plugin = {}; @@ -111,6 +121,12 @@ function itteratePlugins(plugins) { }); } +// Add each plugin folder to the allowed import path so that they can import our +// internal dependancies. +Object.keys(plugins).forEach((type) => itteratePlugins(plugins[type]).forEach((plugin) => { + amp.enableForDir(path.dirname(plugin.path)); +})); + /** * Stores a reference to a section for a section of Plugins. */ diff --git a/test/helpers/index.test.html b/test/helpers/index.test.html index 4619df971..92ff1eb3a 100644 --- a/test/helpers/index.test.html +++ b/test/helpers/index.test.html @@ -6,7 +6,6 @@ Coral - (Beta) -