Merge branch 'master' of github.com:Budibase/budibase into develop

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.8.3",
+  "version": "0.8.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,9 +64,9 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.58.13",
-    "@budibase/client": "^0.8.3",
+    "@budibase/client": "^0.8.5",
     "@budibase/colorpicker": "1.0.1",
-    "@budibase/string-templates": "^0.8.3",
+    "@budibase/string-templates": "^0.8.5",
     "@budibase/svelte-ag-grid": "^1.0.4",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "0.7.0",

packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte

@@ -162,15 +162,15 @@
       linkName = truncate(linkTable.name, { length: 15 })
     return [
       {
-        name: `Many ${thisName} rows has many ${linkName} rows`,
+        name: `Many ${thisName} rows → many ${linkName} rows`,
         value: RelationshipTypes.MANY_TO_MANY,
       },
       {
-        name: `One ${thisName} row has many ${linkName} rows`,
+        name: `One ${linkName} row → many ${thisName} rows`,
         value: RelationshipTypes.ONE_TO_MANY,
       },
       {
-        name: `Many ${thisName} rows has one ${linkName} row`,
+        name: `One ${thisName} row → many ${linkName} rows`,
         value: RelationshipTypes.MANY_TO_ONE,
       },
     ]
@@ -270,9 +270,9 @@
               {value}
               bind:group={field.relationshipType}>
               <div class="radio-button-labels">
-                <label for={value}>{name.split('has')[0]}</label>
+                <label for={value}>{name.split('→')[0]}</label>
-                <label class="rel-type-center" for={value}>has</label>
+                <label class="rel-type-center" for={value}>→</label>
-                <label for={value}>{name.split('has')[1]}</label>
+                <label for={value}>{name.split('→')[1]}</label>
               </div>
             </Radio>
           {/each}

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli",
-  "version": "0.7.8",
+  "version": "0.8.4",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": "src/index.js",

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -9,14 +9,14 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.8.3",
+    "@budibase/string-templates": "^0.8.5",
     "deep-equal": "^2.0.1",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.3",
+    "@budibase/standard-components": "^0.8.5",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",
@@ -30,5 +30,5 @@
     "svelte": "^3.30.0",
     "svelte-jester": "^1.0.6"
   },
-  "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd"
+  "gitHead": "768a9d59da12cfefcd7ccaba05f975e878669504"
 }

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -67,8 +67,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.8.3",
+    "@budibase/client": "^0.8.5",
-    "@budibase/string-templates": "^0.8.3",
+    "@budibase/string-templates": "^0.8.5",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -133,5 +133,5 @@
     "pouchdb-adapter-memory": "^7.2.1",
     "supertest": "^4.0.2"
   },
-  "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd"
+  "gitHead": "768a9d59da12cfefcd7ccaba05f975e878669504"
 }

packages/standard-components/package.json

@@ -35,9 +35,9 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.8.3",
+  "version": "0.8.5",
   "license": "MIT",
-  "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd",
+  "gitHead": "768a9d59da12cfefcd7ccaba05f975e878669504",
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.1.0",
     "@budibase/bbui": "^1.58.13",

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.js",
   "module": "src/index.js",
@@ -33,5 +33,5 @@
     "rollup-plugin-terser": "^7.0.2",
     "typescript": "^4.1.3"
   },
-  "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd"
+  "gitHead": "768a9d59da12cfefcd7ccaba05f975e878669504"
 }

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {
@@ -34,5 +34,5 @@
     "pouchdb-all-dbs": "^1.0.2",
     "server-destroy": "^1.0.1"
   },
-  "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd"
+  "gitHead": "768a9d59da12cfefcd7ccaba05f975e878669504"
 }