Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-27 17:19:42 +02:00
Code Releases Activity

Merge branch 'master' into save-secrets

Browse source
This commit is contained in:
Elliott Stoneham 2016-07-08 18:50:41 +01:00
commit 6ca3725563
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/app/templates/components/document/document-sidebar.hbs
View file

@ -27,6 +27,8 @@
{{#dropdown-dialog target="meta-button-history" position="bottom left" showCancel=false button="Close" onAction=(action 'close') color="flat-gray"}} {{#dropdown-dialog target="meta-button-history" position="bottom left" showCancel=false button="Close" onAction=(action 'close') color="flat-gray"}}
{{document/document-sidebar-edits pages=pages meta=meta}} {{document/document-sidebar-edits pages=pages meta=meta}}
{{/dropdown-dialog}} {{/dropdown-dialog}}
{{else}}
<div class="margin-top-40" />
{{/if}} {{/if}}
{{document/document-sidebar-toc document=model folder=folder pages=pages page=page isEditor=isEditor {{document/document-sidebar-toc document=model folder=folder pages=pages page=page isEditor=isEditor
changePageSequence=(action 'onPageSequenceChange') changePageLevel=(action 'onPageLevelChange') changePageSequence=(action 'onPageSequenceChange') changePageLevel=(action 'onPageLevelChange')

4
app/mirage/config.js
View file

@ -129,7 +129,7 @@ export default function () {
let authorization = request.requestHeaders.Authorization; let authorization = request.requestHeaders.Authorization;
let expectedAuthorization = "Basic OmJyaXpkaWdpdGFsQGdtYWlsLmNvbTp6aW55YW5kbzEyMw=="; let expectedAuthorization = "Basic OmJyaXpkaWdpdGFsQGdtYWlsLmNvbTp6aW55YW5kbzEyMw==";
if (expectedAuthorization == authorization) { if (expectedAuthorization === authorization) {
console.log("SSO login success"); console.log("SSO login success");
return { return {
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkb21haW4iOiIiLCJleHAiOjE0NjQwMjM2NjcsImlzcyI6IkRvY3VtaXplIiwib3JnIjoiVnpNdXlFd18zV3FpYWZjRCIsInN1YiI6IndlYmFwcCIsInVzZXIiOiJWek11eUV3XzNXcWlhZmNFIn0.NXZ6bo8mtvdZF_b9HavbidVUJqhmBA1zr0fSAPvbah0", "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkb21haW4iOiIiLCJleHAiOjE0NjQwMjM2NjcsImlzcyI6IkRvY3VtaXplIiwib3JnIjoiVnpNdXlFd18zV3FpYWZjRCIsInN1YiI6IndlYmFwcCIsInVzZXIiOiJWek11eUV3XzNXcWlhZmNFIn0.NXZ6bo8mtvdZF_b9HavbidVUJqhmBA1zr0fSAPvbah0",
@ -161,7 +161,7 @@ export default function () {
}; };
} }
if (expectedAuthorization != authorization) { if (expectedAuthorization !== authorization) {
return new Mirage.Response(401, { 'Content-Type': 'application/json' }, { message: 'Bad Request' }); return new Mirage.Response(401, { 'Content-Type': 'application/json' }, { message: 'Bad Request' });
} }

4
documize/api/endpoint/router.go
View file

@ -28,8 +28,8 @@ import (
const ( const (
// AppVersion does what it says // AppVersion does what it says
// Versioning scheme: http://semver.org // Note: versioning scheme is not http://semver.org
AppVersion = "1.0.0" AppVersion = "0.14.0"
) )
var port, certFile, keyFile, forcePort2SSL string var port, certFile, keyFile, forcePort2SSL string