diff options
Diffstat (limited to '')
| -rw-r--r-- | public/css/slide.css | 3 | ||||
| -rw-r--r-- | public/docs/release-notes.md | 21 | ||||
| -rw-r--r-- | public/vendor/md-toc.js | 3 | ||||
| -rw-r--r-- | public/views/index/body.ejs | 5 | ||||
| -rw-r--r-- | public/views/shared/signin-modal.ejs | 9 |
5 files changed, 35 insertions, 6 deletions
diff --git a/public/css/slide.css b/public/css/slide.css index a8591108..f8f9c717 100644 --- a/public/css/slide.css +++ b/public/css/slide.css @@ -81,7 +81,8 @@ .task-list-item-checkbox { font-size: inherit; height: 1em; - margin: 0.2em 0 0.2em -0.65em !important; + transform: scale(2); + margin: 0.15em 0 0.15em -0.84em !important; } pre code .wrapper { diff --git a/public/docs/release-notes.md b/public/docs/release-notes.md index a6428eed..891c506a 100644 --- a/public/docs/release-notes.md +++ b/public/docs/release-notes.md @@ -1,6 +1,27 @@ Release Notes === +<i class="fa fa-tag"></i> 1.1.1-ce <i class="fa fa-clock-o"></i> 2018-05-23 12:00 +--- + +### Security +* Fix Google Drive integration leaked `clientSecret` for Google integration +* Update base64url package + +### Fixes +* Fix typos in integrations +* Fix high need of file descriptors during build +* Fix heroku deployment by limiting node version to <10.x + +### Refactors +* Refactor letterAvatars to be compliant with CSP + +### Removes +* Google Drive integration + +### Honorable mentions +* [Max Wu (jackycute)](https://github.com/jackycute) + <i class="fa fa-tag"></i> 1.1.0-ce <i class="fa fa-clock-o"></i> 2018-04-06 12:00 --- diff --git a/public/vendor/md-toc.js b/public/vendor/md-toc.js index f93f7921..3457d465 100644 --- a/public/vendor/md-toc.js +++ b/public/vendor/md-toc.js @@ -54,6 +54,7 @@ var j = i + 1 this._elTitleElement = this.elTitleElements[i] this._elTitleElementName = this._elTitleElement.tagName + this._elTitleElementTitle = this._elTitleElement.textContent.replace(/"/g, '"') this._elTitleElementText = (typeof this.process === 'function' ? this.process(this._elTitleElement) : this._elTitleElement.innerHTML).replace(/<(?:.|\n)*?>/gm, '') var id = this._elTitleElement.getAttribute('id') if (!id) { @@ -63,7 +64,7 @@ id = '#' + id } - this.tocContent += '<li><a href="' + id + '">' + this._elTitleElementText + '</a>' + this.tocContent += '<li><a href="' + id + '" title="'+ this._elTitleElementTitle +'">' + this._elTitleElementText + '</a>' if (j !== this._elTitleElementsLen) { this._elNextTitleElementName = this.elTitleElements[j].tagName diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index a7c5a0b8..220e0dae 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -15,7 +15,7 @@ <% if(allowAnonymous) { %> <a type="button" href="<%- url %>/new" class="btn btn-sm btn-primary"><i class="fa fa-plus"></i> <%= __('New guest note') %></a> <% } %> - <% if(facebook || twitter || github || gitlab || mattermost || dropbox || google || ldap || saml || email) { %> + <% if(facebook || twitter || github || gitlab || mattermost || dropbox || google || ldap || saml || oauth2 || email) { %> <button class="btn btn-sm btn-success ui-signin" data-toggle="modal" data-target=".signin-modal"><%= __('Sign In') %></button> <% } %> </div> @@ -51,7 +51,7 @@ <% if (errorMessage && errorMessage.length > 0) { %> <div class="alert alert-danger" style="max-width: 400px; margin: 0 auto;"><%= errorMessage %></div> <% } %> - <% if(facebook || twitter || github || gitlab || mattermost || dropbox || google || ldap || saml || email) { %> + <% if(facebook || twitter || github || gitlab || mattermost || dropbox || google || ldap || saml || oauth2 || email) { %> <span class="ui-signin"> <br> <a type="button" class="btn btn-lg btn-success ui-signin" data-toggle="modal" data-target=".signin-modal" style="min-width: 200px;"><%= __('Sign In') %></a> @@ -147,6 +147,7 @@ <option value="sv">svenska</option> <option value="eo">Esperanto</option> <option value="da">dansk</option> + <option value="ko">한국어</option> </select> <p> © 2018 <a href="https://hackmd.io">HackMD</a> | <a href="<%- url %>/s/release-notes" target="_blank"><%= __('Releases') %></a><% if(privacyStatement) { %> | <a href="<%- url %>/s/privacy" target="_blank"><%= __('Privacy') %></a><% } %><% if(termsOfUse) { %> | <a href="<%- url %>/s/terms-of-use" target="_blank"><%= __('Terms of Use') %></a><% } %> diff --git a/public/views/shared/signin-modal.ejs b/public/views/shared/signin-modal.ejs index 82b5cf1f..f0cffad9 100644 --- a/public/views/shared/signin-modal.ejs +++ b/public/views/shared/signin-modal.ejs @@ -48,7 +48,12 @@ <i class="fa fa-users"></i> <%= __('Sign in via %s', 'SAML') %> </a> <% } %> - <% if((facebook || twitter || github || gitlab || mattermost || dropbox || google || saml) && ldap) { %> + <% if(oauth2) { %> + <a href="<%- url %>/auth/oauth2" class="btn btn-lg btn-block btn-social btn-soundcloud"> + <i class="fa fa-mail-forward"></i> <%= __('Sign in via %s', oauth2ProviderName || 'OAuth2') %> + </a> + <% } %> + <% if((facebook || twitter || github || gitlab || mattermost || dropbox || google || saml || oauth2) && ldap) { %> <hr> <% }%> <% if(ldap) { %> @@ -73,7 +78,7 @@ </div> </form> <% } %> - <% if((facebook || twitter || github || gitlab || mattermost || dropbox || google || ldap) && email) { %> + <% if((facebook || twitter || github || gitlab || mattermost || dropbox || google || ldap || oauth2) && email) { %> <hr> <% }%> <% if(email) { %> |