From e72126b72c974e20b2e8503d946a5af0a9781196 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Fri, 8 Jul 2016 09:52:13 -0700 Subject: [PATCH 1/3] test lint fixes --- app/mirage/config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/mirage/config.js b/app/mirage/config.js index 8dd23999..40501d1f 100644 --- a/app/mirage/config.js +++ b/app/mirage/config.js @@ -129,7 +129,7 @@ export default function () { let authorization = request.requestHeaders.Authorization; let expectedAuthorization = "Basic OmJyaXpkaWdpdGFsQGdtYWlsLmNvbTp6aW55YW5kbzEyMw=="; - if (expectedAuthorization == authorization) { + if (expectedAuthorization === authorization) { console.log("SSO login success"); return { "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' }); } @@ -445,4 +445,4 @@ export default function () { return {}; }); -} +} \ No newline at end of file From 42c81b881fa8a0f83b3548981b3d5c424fcb44d2 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Fri, 8 Jul 2016 10:03:34 -0700 Subject: [PATCH 2/3] add spacing above TOC when anon mode --- app/app/templates/components/document/document-sidebar.hbs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/app/templates/components/document/document-sidebar.hbs b/app/app/templates/components/document/document-sidebar.hbs index 97279466..005e9f05 100644 --- a/app/app/templates/components/document/document-sidebar.hbs +++ b/app/app/templates/components/document/document-sidebar.hbs @@ -27,6 +27,8 @@ {{#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}} {{/dropdown-dialog}} + {{else}} +
{{/if}} {{document/document-sidebar-toc document=model folder=folder pages=pages page=page isEditor=isEditor changePageSequence=(action 'onPageSequenceChange') changePageLevel=(action 'onPageLevelChange') From 4c1c876f0459fd612129a260657863ba499af786 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Fri, 8 Jul 2016 10:32:15 -0700 Subject: [PATCH 3/3] bump version --- documize/api/endpoint/router.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documize/api/endpoint/router.go b/documize/api/endpoint/router.go index f5255202..9d844a5d 100644 --- a/documize/api/endpoint/router.go +++ b/documize/api/endpoint/router.go @@ -28,8 +28,8 @@ import ( const ( // AppVersion does what it says - // Versioning scheme: http://semver.org - AppVersion = "1.0.0" + // Note: versioning scheme is not http://semver.org + AppVersion = "0.14.0" ) var port, certFile, keyFile, forcePort2SSL string