diff options
| -rw-r--r-- | app.js | 2 | ||||
| -rw-r--r-- | lib/config/default.js | 3 | ||||
| -rw-r--r-- | lib/config/dockerSecret.js | 3 | ||||
| -rw-r--r-- | lib/config/environment.js | 3 | ||||
| -rw-r--r-- | public/js/extra.js | 3 | ||||
| -rw-r--r-- | public/views/index/body.ejs | 2 |
6 files changed, 10 insertions, 6 deletions
@@ -34,7 +34,7 @@ var data = { version: config.version, GOOGLE_API_KEY: config.google.clientSecret, GOOGLE_CLIENT_ID: config.google.clientID, - DROPBOX_APP_KEY: config.dropbox.clientSecret + DROPBOX_APP_KEY: config.dropbox.appKey } ejs.renderFile(constpath, data, {}, function (err, str) { diff --git a/lib/config/default.js b/lib/config/default.js index 8d36db02..40803476 100644 --- a/lib/config/default.js +++ b/lib/config/default.js @@ -81,7 +81,8 @@ module.exports = { }, dropbox: { clientID: undefined, - clientSecret: undefined + clientSecret: undefined, + appKey: undefined }, google: { clientID: undefined, diff --git a/lib/config/dockerSecret.js b/lib/config/dockerSecret.js index ac54fd19..b9116cd3 100644 --- a/lib/config/dockerSecret.js +++ b/lib/config/dockerSecret.js @@ -44,7 +44,8 @@ if (fs.existsSync(basePath)) { }, dropbox: { clientID: getSecret('dropbox_clientID'), - clientSecret: getSecret('dropbox_clientSecret') + clientSecret: getSecret('dropbox_clientSecret'), + appKey: getSecret('dropbox_appKey') }, google: { clientID: getSecret('google_clientID'), diff --git a/lib/config/environment.js b/lib/config/environment.js index 27e63591..5a297382 100644 --- a/lib/config/environment.js +++ b/lib/config/environment.js @@ -56,7 +56,8 @@ module.exports = { }, dropbox: { clientID: process.env.HMD_DROPBOX_CLIENTID, - clientSecret: process.env.HMD_DROPBOX_CLIENTSECRET + clientSecret: process.env.HMD_DROPBOX_CLIENTSECRET, + appKey: process.env.HMD_DROPBOX_APPKEY }, google: { clientID: process.env.HMD_GOOGLE_CLIENTID, diff --git a/public/js/extra.js b/public/js/extra.js index 75aa29af..ec7d39da 100644 --- a/public/js/extra.js +++ b/public/js/extra.js @@ -1007,9 +1007,10 @@ md.use(markdownitContainer, 'info', { render: renderContainer }) md.use(markdownitContainer, 'warning', { render: renderContainer }) md.use(markdownitContainer, 'danger', { render: renderContainer }) +let defaultImageRender = md.renderer.rules.image md.renderer.rules.image = function (tokens, idx, options, env, self) { tokens[idx].attrJoin('class', 'raw') - return self.renderToken(...arguments) + return defaultImageRender(...arguments) } md.renderer.rules.list_item_open = function (tokens, idx, options, env, self) { tokens[idx].attrJoin('class', 'raw') diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index d7b4458e..913eef10 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -126,7 +126,7 @@ <iframe src="//ghbtns.com/github-btn.html?user=hackmdio&repo=hackmd&type=star&count=true" frameborder="0" scrolling="0" width="104px" height="20px"></iframe> </h6> <p> - © 2017 <a href="https://www.facebook.com/hackmdio" target="_blank"><i class="fa fa-facebook-square"></i> HackMD</a> | <a href="<%- url %>/s/release-notes" target="_blank"><%= __('Releases') %></a> + © 2018 <a href="https://www.facebook.com/hackmdio" target="_blank"><i class="fa fa-facebook-square"></i> HackMD</a> | <a href="<%- url %>/s/release-notes" target="_blank"><%= __('Releases') %></a> </p> <select class="ui-locale"> <option value="en">English</option> |