Merge branch 'master' into multi-wiki-support

.github/workflows/cla-signed.yml

@@ -23,8 +23,8 @@ jobs:
  pull-requests: write
  steps:
  - run: |
- if ! $BRANCH == "tiddlywiki-com"; then
- echo "This CLA signature targets the wrong branch"
+ if [[ "$BRANCH" != "tiddlywiki-com" ]]; then
+ echo "This CLA signature targets the wrong branch: $BRANCH"
  gh pr comment "$NUMBER" -b "@$AUTHOR Signatures to the CLA must target the 'tiddlywiki-com' branch."
  fi
  env:

core/modules/startup/rootwidget.js

@@ -52,7 +52,9 @@ exports.startup = function() {
  basicAuthUsername: params["basic-auth-username"],
  basicAuthUsernameFromStore: params["basic-auth-username-from-store"],
  basicAuthPassword: params["basic-auth-password"],
- basicAuthPasswordFromStore: params["basic-auth-password-from-store"]
+ basicAuthPasswordFromStore: params["basic-auth-password-from-store"],
+ bearerAuthToken: params["bearer-auth-token"],
+ bearerAuthTokenFromStore: params["bearer-auth-token-from-store"]
  });
  });
  $tw.rootWidget.addEventListener("tm-http-cancel-all-requests",function(event) {

core/modules/utils/dom/http.js

@@ -104,6 +104,8 @@ basicAuthUsername: plain username for basic authentication
 basicAuthUsernameFromStore: name of password store entry containing username
 basicAuthPassword: plain password for basic authentication
 basicAuthPasswordFromStore: name of password store entry containing password
+bearerAuthToken: plain text token for bearer authentication
+bearerAuthTokenFromStore: name of password store entry contain bear authorization token
 */
 function HttpClientRequest(options) {
  var self = this;
@@ -135,8 +137,11 @@ function HttpClientRequest(options) {
  });
  this.basicAuthUsername = options.basicAuthUsername || (options.basicAuthUsernameFromStore && $tw.utils.getPassword(options.basicAuthUsernameFromStore)) || "";
  this.basicAuthPassword = options.basicAuthPassword || (options.basicAuthPasswordFromStore && $tw.utils.getPassword(options.basicAuthPasswordFromStore)) || "";
+ this.bearerAuthToken = options.bearerAuthToken || (options.bearerAuthTokenFromStore && $tw.utils.getPassword(options.bearerAuthTokenFromStore)) || "";
  if(this.basicAuthUsername && this.basicAuthPassword) {
  this.requestHeaders.Authorization = "Basic " + $tw.utils.base64Encode(this.basicAuthUsername + ":" + this.basicAuthPassword);
+ } else if(this.bearerAuthToken) {
+ this.requestHeaders.Authorization = "Bearer " + this.bearerAuthToken;
  }
 }
 

core/palettes/Vanilla.tid

@@ -32,7 +32,7 @@ dragger-background: <<colour foreground>>
 dragger-foreground: <<colour background>>
 dropdown-background: <<colour background>>
 dropdown-border: <<colour muted-foreground>>
-dropdown-tab-background-selected: #fff
+dropdown-tab-background-selected: #ffffff
 dropdown-tab-background: #ececec
 dropzone-background: rgba(0,200,0,0.7)
 external-link-background-hover: inherit
@@ -54,7 +54,7 @@ modal-border: #999999
 modal-footer-background: #f5f5f5
 modal-footer-border: #dddddd
 modal-header-border: #eeeeee
-muted-foreground: #bbb
+muted-foreground: #bbbbbb
 network-activity-foreground: #448844
 notification-background: #ffffdd
 notification-border: #999999
@@ -98,7 +98,7 @@ tab-foreground: #666666
 table-border: #dddddd
 table-footer-background: #a8a8a8
 table-header-background: #f0f0f0
-tag-background: #ec6
+tag-background: #eecc66
 tag-foreground: #ffffff
 testcase-accent-level-1: #c1eaff
 testcase-accent-level-2: #E3B740
@@ -132,19 +132,19 @@ toolbar-done-button:
 untagged-background: #999999
 very-muted-foreground: #888888
 wikilist-background: #e5e5e5
-wikilist-item: #fff
-wikilist-info: #000
-wikilist-title: #666
+wikilist-item: #ffffff
+wikilist-info: #000000
+wikilist-title: #666666
 wikilist-title-svg: <<colour wikilist-title>>
-wikilist-url: #aaa
+wikilist-url: #aaaaaa
 wikilist-button-open: #4fb82b
 wikilist-button-open-hover: green
 wikilist-button-reveal: #5778d8
 wikilist-button-reveal-hover: blue
 wikilist-button-remove: #d85778
 wikilist-button-remove-hover: red
 wikilist-toolbar-background: #d3d3d3
-wikilist-toolbar-foreground: #888
+wikilist-toolbar-foreground: #888888
 wikilist-droplink-dragover: rgba(255,192,192,0.5)
 wikilist-button-background: #acacac
-wikilist-button-foreground: #000
+wikilist-button-foreground: #000000