(core) updates from grist-core

gristlabs · Nov 4, 2024 · b633dd7 · b633dd7
2 parents f063488 + 657cbfb
commit b633dd7
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -440,6 +440,13 @@ TYPEORM_TYPE     | set to 'sqlite' or 'postgres'
 TYPEORM_USERNAME | username to connect as
 TYPEORM_EXTRA    | any other properties to pass to TypeORM in JSON format
 
+#### Docker-only variables:
+
+Variable | Purpose
+---------|--------
+GRIST_DOCKER_USER  | optional. When the container runs as the root user, this is the user the Grist services run as. Overrides the default.
+GRIST_DOCKER_GROUP | optional. When the container runs as the root user, this is the group the Grist services run as. Overrides the default.
+
 #### Testing:
 
 Variable | Purpose

diff --git a/app/client/ui2018/cssVars.ts b/app/client/ui2018/cssVars.ts
@@ -111,7 +111,7 @@ export const vars = {
   labelTextBg:    new CustomProp('label-text-bg', '#FFFFFF'),
   labelActiveBg:  new CustomProp('label-active-bg', '#F0F0F0'),
 
-  controlMargin:  new CustomProp('normal-margin', '2px'),
+  controlMargin:  new CustomProp('normal-margin',  '2px'),
   controlPadding: new CustomProp('normal-padding', '3px 5px'),
   tightPadding:   new CustomProp('tight-padding',  '1px 2px'),
   loosePadding:   new CustomProp('loose-padding',  '5px 15px'),
@@ -497,7 +497,7 @@ export const theme = {
   documentHistoryTableBorder: new CustomProp('theme-document-history-table-border',
     undefined, 'lightgray'),
   documentHistoryTableBorderLight: new CustomProp('theme-document-history-table-border-light',
-    undefined, '#D9D9D9'),
+    undefined, colors.darkGrey),
 
   /* Accents */
   accentIcon: new CustomProp('theme-accent-icon', undefined, colors.lightGreen),
@@ -554,7 +554,7 @@ export const theme = {
   menuItemFg: new CustomProp('theme-menu-item-fg', undefined, 'black'),
   menuItemSelectedFg: new CustomProp('theme-menu-item-selected-fg', undefined, colors.light),
   menuItemSelectedBg: new CustomProp('theme-menu-item-selected-bg', undefined, vars.primaryBg),
-  menuItemDisabledFg: new CustomProp('theme-menu-item-disabled-fg', undefined, '#D9D9D9'),
+  menuItemDisabledFg: new CustomProp('theme-menu-item-disabled-fg', undefined, colors.darkGrey),
   menuItemIconFg: new CustomProp('theme-menu-item-icon-fg', undefined, colors.slate),
   menuItemIconSelectedFg: new CustomProp('theme-menu-item-icon-selected-fg', undefined, 'white'),
 
@@ -804,7 +804,7 @@ export const theme = {
   colorSelectFontOptionBgSelected: new CustomProp('theme-color-select-font-option-bg-selected',
     undefined, colors.dark),
   colorSelectColorSquareBorder: new CustomProp('theme-color-select-color-square-border',
-    undefined, '#D9D9D9'),
+    undefined, colors.darkGrey),
   colorSelectColorSquareBorderEmpty: new CustomProp('theme-color-select-color-square-border-empty',
     undefined, colors.dark),
   colorSelectInputFg: new CustomProp('theme-color-select-input-fg',
@@ -865,13 +865,13 @@ export const theme = {
   attachmentsCellIconFg: new CustomProp(
     'theme-attachments-cell-icon-fg', undefined, 'white'),
   attachmentsCellIconBg: new CustomProp(
-    'theme-attachments-cell-icon-bg', undefined, '#D9D9D9'),
+    'theme-attachments-cell-icon-bg', undefined, colors.darkGrey),
   attachmentsCellIconHoverBg: new CustomProp(
     'theme-attachments-cell-icon-hover-bg', undefined, '#929299'),
 
   /* Announcement Popups */
   announcementPopupFg: new CustomProp('theme-announcement-popup-fg', undefined, '#000000'),
-  announcementPopupBg: new CustomProp('theme-announcement-popup-bg', undefined, '#DCF4EB'),
+  announcementPopupBg: new CustomProp('theme-announcement-popup-bg', undefined, colors.selectionOpaque),
 
   /* Switches */
   switchSliderFg: new CustomProp('theme-switch-slider-fg', undefined, '#ccc'),

diff --git a/app/client/widgets/MarkdownTextBox.ts b/app/client/widgets/MarkdownTextBox.ts
@@ -140,10 +140,10 @@ const cssMarkdown = styled('div', `
   & code {
     padding: .2em .4em;
     margin: 0;
-    white-space: nowrap;
+    white-space: pre;
   }
   &-text-wrap code {
-    white-space: break-spaces;
+    white-space: pre-wrap;
   }
   & pre {
     padding: 16px;
@@ -168,17 +168,17 @@ const cssMarkdown = styled('div', `
     margin: 0;
     padding: 0;
   }
-  &-text-wrap pre > code {
-    white-space: normal;
-  }
   & pre .ace-chrome, & pre .ace-dracula {
     background: ${theme.markdownCellLightBg} !important;
   }
   & .ace_indent-guide {
     background: none;
   }
   & .ace_static_highlight {
-    white-space: nowrap;
+    white-space: pre;
+  }
+  &-text-wrap .ace_static_highlight {
+    white-space: pre-wrap;
   }
   & ul, & ol {
     padding-left: 2em;

diff --git a/app/server/lib/Assistance.ts b/app/server/lib/Assistance.ts
@@ -256,6 +256,7 @@ export class OpenAIAssistant implements Assistant {
         headers: {
           ...(this._apiKey ? {
             "Authorization": `Bearer ${this._apiKey}`,
+            "api-key": this._apiKey,
           } : undefined),
           "Content-Type": "application/json",
         },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grist-core",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "license": "Apache-2.0",
   "description": "Grist is the evolution of spreadsheets",
   "homepage": "https://github.com/gristlabs/grist-core",

diff --git a/static/locales/eu.client.json b/static/locales/eu.client.json
@@ -524,7 +524,8 @@
         "Workspace will be moved to Trash.": "Lan-eremua zakarrontzira mugituko da.",
         "Workspaces": "Lan-eremuak",
         "Delete {{workspace}} and all included documents?": "{{workspace}} eta barne dituen dokumentu guztiak ezabatu?",
-        "Tutorial": "Tutoriala"
+        "Tutorial": "Tutoriala",
+        "Grist Resources": "Gristen baliabideak"
     },
     "LeftPanelCommon": {
         "Help Center": "Laguntza Gunea"

diff --git a/static/locales/sk.client.json b/static/locales/sk.client.json
@@ -605,7 +605,8 @@
         "Workspace will be moved to Trash.": "Pracovný priestor sa presunie do Koša.",
         "Workspaces": "Pracovné priestory",
         "Terms of service": "Podmienky služby",
-        "Tutorial": "Návod"
+        "Tutorial": "Návod",
+        "Grist Resources": "Zdroje Grist"
     },
     "LeftPanelCommon": {
         "Help Center": "Centrum Pomoci"

diff --git a/static/locales/sk.server.json b/static/locales/sk.server.json
@@ -1 +1,8 @@
-{}
+{
+    "oidc": {
+        "emailNotVerifiedError": "Overte svoj e-mail u poskytovateľa identity a prihláste sa znova."
+    },
+    "sendAppPage": {
+        "Loading": "Načítanie"
+    }
+}
diff --git a/static/locales/zh_Hant.server.json b/static/locales/zh_Hant.server.json
@@ -1 +1,8 @@
-{}
+{
+    "sendAppPage": {
+        "Loading": "載入中"
+    },
+    "oidc": {
+        "emailNotVerifiedError": "請透過身份驗證提供者驗證您的電子郵件，然後重新登入。"
+    }
+}