Commit Graph

452 Commits

Author SHA1 Message Date
Rory Powell 0edc8800bd Pro build fixes 2022-04-22 09:43:51 +01:00
Martin McKeaveney 79a8a63ede use ioredis mock for in memory redis tests 2022-04-21 20:24:43 +01:00
Rory Powell 81cb05b9ef Add explicit pro dependency to worker and server 2022-04-21 15:08:14 +01:00
mike12345567 9899781fc5 Some updates, making sure databases will always close directly using finally checks around the actual tasks, updating how replication works to have a close statement (to make sure it is controlled correctly) and then updating to PouchDB 7.3.0 for one of the memory leak fixes. 2022-04-20 17:33:42 +01:00
Vinoth Kirubakaran ad87bc2bcf feat: made changes to worker and server packages to use global-agent to setup proxy from env variables 2022-04-20 16:00:03 +05:30
Rory Powell fa1f9ad6cc Merge branch 'develop' into feature/licensing 2022-04-13 21:24:07 +01:00
dependabot[bot] 6264bbb48f Bump urijs from 1.19.8 to 1.19.11 in /packages/server
Bumps [urijs](https://github.com/medialize/URI.js) from 1.19.8 to 1.19.11.
- [Release notes](https://github.com/medialize/URI.js/releases)
- [Changelog](https://github.com/medialize/URI.js/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/medialize/URI.js/compare/v1.19.8...v1.19.11)

---
updated-dependencies:
- dependency-name: urijs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-13 00:14:16 +00:00
Rory Powell 33719fcb09 Merge branch 'feature/licensing' into feature/posthog-v2 2022-04-12 17:12:46 +01:00
Rory Powell 03ba6d914f Merge branch 'develop' into feature/licensing 2022-04-12 16:18:41 +01:00
Rory Powell 5ab9f1a9c5 Table CRUD events + add timekeeper for tests 2022-04-11 14:39:31 +01:00
Martin McKeaveney 417ba977fa redis integration complete 2022-03-31 15:44:06 +01:00
Rory Powell 4789e7f02b update server lockfile 2022-03-28 09:50:52 +01:00
Rory Powell 75d5c0c0b9 Merge branch 'feature/licensing' into feature/posthog-v2 2022-03-28 09:47:34 +01:00
dependabot[bot] 16f16dba40 Bump minimist from 1.2.5 to 1.2.6 in /packages/server
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-25 14:09:06 +00:00
Rory Powell f5809a2cbf clean and bootstrap 2022-03-25 13:14:44 +00:00
Rory Powell 69b2b38aea Merge branch 'master' into merge-master 2022-03-25 13:10:37 +00:00
Rory Powell 3e5e95a9c1 Add analytics to backend-core. Update server posthog usage 2022-03-25 13:04:34 +00:00
Rory Powell dd9503ac09 Add typescript linting at the top level 2022-03-25 11:17:58 +00:00
Rory Powell 4856cdd819 Revert lock files 2022-03-24 13:53:47 +00:00
Andrew Kingston 2242044f3b Allow deep-getting of pagination params from REST responses 2022-03-24 10:07:23 +00:00
Rory Powell a68abf2730 Fix cross tenant apps with session 2022-03-23 16:45:06 +00:00
mike12345567 d64df5fd78 Adding a fix for #4996 - checks if WSL is in use when configuring nginx. 2022-03-23 15:31:08 +00:00
Rory Powell 0a4b1eb552 Tests complete + backwards compatibility for deployment 2022-03-22 00:23:22 +00:00
Rory Powell 715d42d3e6 Merge branch 'develop' into feature/licensing 2022-03-21 17:13:16 +00:00
mike12345567 9364f4170f Updating yarn locks. 2022-03-14 12:00:44 +00:00
Martin McKeaveney 06db377b31 update yarn lock 2022-03-10 13:33:10 +00:00
Rory Powell 7698e9293c Self Host <-> Licensing integration 2022-03-09 21:16:22 +00:00
mike12345567 e9ff42bf76 Fixing various other ms-sql types. 2022-03-04 13:48:21 +00:00
Rory Powell b686c19658 Enforce licensed developer count + error types/codes framework 2022-03-04 13:42:50 +00:00
Rory Powell a81041bc40 Add shared licensing cache 2022-03-03 13:37:04 +00:00
mike12345567 823b2cb6c4 Removing koa rate limit types, was requiring types for every store, types didn't work correctly. 2022-03-03 12:19:12 +00:00
mike12345567 1751ebf6ca Merge branch 'develop' of github.com:Budibase/budibase into feature/rate-limiting 2022-03-03 11:48:18 +00:00
Michael Drury 546bbc2ff6 Changing how SQL vars are generated so that when new SQL implementations are added they must implement a generation mechanism. 2022-03-02 22:45:10 +00:00
mike12345567 2247987df2 Updating rate limiter to make use of Redis. 2022-03-02 12:27:09 +00:00
mike12345567 a962f6cabd Adding public API rate limiting, with env variable option, defaults to 120 requests per minute. 2022-03-02 11:36:30 +00:00
mike12345567 bcf90791cb Merge branch 'dependabot/npm_and_yarn/packages/server/prismjs-1.27.0' of github.com:Budibase/budibase into develop 2022-03-02 10:40:59 +00:00
mike12345567 6d2de3c436 Merge branch 'dependabot/npm_and_yarn/packages/server/urijs-1.19.8' of github.com:Budibase/budibase into develop 2022-03-02 10:40:45 +00:00
dependabot[bot] 54bb65b227 Bump url-parse from 1.5.3 to 1.5.10 in /packages/server
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-02 09:56:27 +00:00
dependabot[bot] c102119682 Bump urijs from 1.19.7 to 1.19.8 in /packages/server
Bumps [urijs](https://github.com/medialize/URI.js) from 1.19.7 to 1.19.8.
- [Release notes](https://github.com/medialize/URI.js/releases)
- [Changelog](https://github.com/medialize/URI.js/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/medialize/URI.js/compare/v1.19.7...v1.19.8)

---
updated-dependencies:
- dependency-name: urijs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-02 09:56:26 +00:00
dependabot[bot] c53a020ea1 Bump prismjs from 1.25.0 to 1.27.0 in /packages/server
Bumps [prismjs](https://github.com/PrismJS/prism) from 1.25.0 to 1.27.0.
- [Release notes](https://github.com/PrismJS/prism/releases)
- [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PrismJS/prism/compare/v1.25.0...v1.27.0)

---
updated-dependencies:
- dependency-name: prismjs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-02 09:56:25 +00:00
Rory Powell 040d80fc55 Merge branch 'master' into licensing-poc-master 2022-03-01 21:10:51 +00:00
mike12345567 f056bdd353 Adding new generation technique, converting openAPI spec to typescript definitions, which are then applied in mapping output middlewares to make sure that the structures of the response are fully respected. 2022-03-01 18:35:08 +00:00
mike12345567 4a31045233 Changing the API key modal to have a copy input which allows copying the API key easily. 2022-02-28 14:29:19 +00:00
mike12345567 c1a1c02e73 Updating validators, make sure everything that is optional is really optional. 2022-02-25 11:39:46 +00:00
Michael Drury 01bb56cbf4 Adding a testing system which generates the schema and compares against responses. 2022-02-24 23:21:10 +00:00
Michael Drury aeae61342a Adding table public API. 2022-02-23 22:13:16 +00:00
mike12345567 6cbf186ead Merge branch 'develop' of github.com:Budibase/budibase into feature/budibase-api 2022-02-21 14:34:06 +00:00
Rory Powell a4ea1dd8c0 Fix lockfile 2022-02-18 12:06:18 +00:00
Rory Powell 814b5ae5ab Merge branch 'master' into develop 2022-02-18 11:57:54 +00:00
mike12345567 6dc0dde9d7 Adding openAPI generation. 2022-02-16 16:42:50 +00:00
Martin McKeaveney a85f667dbe templatize nginx configuration into one prod configuration and add NPM scripts to manage 2022-02-16 14:12:53 +01:00
Rory Powell d02b40ed50 Pin sentry to pre-broken version. See https://github.com/getsentry/sentry-javascript/issues/4594 2022-02-16 11:43:38 +00:00
Rory Powell 1cb660e6b2 Update @typescript-eslint/parser 2022-02-16 10:39:32 +00:00
Rory Powell 090b44567f Use consistent typescript version 2022-02-16 10:35:01 +00:00
Rory Powell 029125794b Tidy 2022-02-16 10:22:24 +00:00
Rory Powell f56bc8c9ac Version bump 2022-02-16 10:12:25 +00:00
Rory Powell d7ac1a8426 Re-add lock files 2022-02-16 10:10:01 +00:00
dependabot[bot] f1e7702aec Bump vm2 from 3.9.5 to 3.9.6 in /packages/server
Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.5 to 3.9.6.
- [Release notes](https://github.com/patriksimek/vm2/releases)
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/patriksimek/vm2/compare/3.9.5...3.9.6)

---
updated-dependencies:
- dependency-name: vm2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-15 00:48:56 +00:00
dependabot[bot] 09bad475e3 Bump follow-redirects from 1.14.5 to 1.14.8 in /packages/server
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.5 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.5...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-13 14:54:53 +00:00
Martin McKeaveney a495050871 merge with develop 2022-02-10 11:39:15 +01:00
mike12345567 55b380c3c5 Fix for #4119 - any object based column will be exported with the comma types correctly encapsulated. 2022-02-08 14:34:52 +00:00
Martin McKeaveney c11e26cb2e merge 2022-02-01 11:22:14 +01:00
Rory Powell 33e19c49a0 Reorder jest mock and import statements for email mocking 2022-01-31 21:05:14 +00:00
Martin McKeaveney 7b644dd8f3 merge 2022-01-31 17:02:27 +01:00
Martin McKeaveney 19d27c97a4 code review and merge with develop 2022-01-26 17:45:28 +01:00
dependabot[bot] c2d734db34 Bump node-fetch from 2.6.6 to 2.6.7
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.6...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 15:43:06 +00:00
Martin McKeaveney a70b96a21a gsheets E2E 2022-01-15 19:28:04 +01:00
Martin McKeaveney 3544c8ac82 nginx proxy configs 2022-01-14 14:44:40 +01:00
Andrew Kingston 9a7cc4113d Merge branch 'develop' of github.com:Budibase/budibase into rest-pagination 2022-01-13 09:44:09 +00:00
mike12345567 1327394784 Switching out @budibase/auth to @budibase/backend-core. 2022-01-10 19:33:00 +00:00
Martin McKeaveney c2d97b9449 google auth working 2022-01-06 08:08:54 +00:00
Andrew Kingston abc02d812a Merge branch 'feature/query-variables' of github.com:Budibase/budibase into rest-pagination 2022-01-05 09:21:25 +00:00
Andrew Kingston db55074b0a Merge branch 'develop' of github.com:Budibase/budibase into rest-pagination 2022-01-04 14:34:09 +00:00
Martin McKeaveney a09fabc54b merge with master 2021-12-30 23:10:46 +00:00
mike12345567 ff69aad969 Fixing conflict. 2021-12-21 12:33:12 +00:00
Martin McKeaveney f32176590a adding swagger parser dep 2021-12-20 09:12:27 +00:00
Michael Drury f03f3c8864 Fixing some issues discovered with saving queries and dynamic variables, also displaying dynamic variables in a reactive way. 2021-12-16 19:33:47 +00:00
mike12345567 da7153dd64 Removing outgoing webhook functionality from automations and adding XML response/sending, as well as form data/encoded data. 2021-12-14 17:59:02 +00:00
Martin McKeaveney a5a522798b re-add missing dependency 2021-12-13 18:09:17 +01:00
Martin McKeaveney e1fcf40084 Merge branch 'master' into develop 2021-12-13 17:38:13 +01:00
Martin McKeaveney 2751f9d4c4 adding and updating helm repos 2021-12-13 16:52:35 +01:00
Rory Powell cadd3cf259 Fix merge import 2021-12-02 15:20:03 +00:00
Rory Powell 224516787d Merge + Linting 2021-12-02 14:54:47 +00:00
Rory Powell 3923fd6831 Add type hierarchy for importers 2021-12-01 09:48:52 +00:00
Rory Powell c421499a46 cURL import working 2021-11-29 17:21:30 +00:00
Rory Powell c53f5e3d2b Update backend to be extensible for different import sources 2021-11-29 10:37:31 +00:00
mike12345567 a99bf1bba3 Updating scripts to allow opening in the browser when generated. 2021-11-25 18:13:14 +00:00
Martin McKeaveney f9b2a3c5e1 Google sheets integration CRUD E2E 2021-11-25 18:12:12 +01:00
mike12345567 88f31bcf34 Basic work for generating. 2021-11-25 16:13:19 +00:00
mike12345567 f959ea0add Adding more error tracking around column creation, to reduce confusion/users not understanding required settings. 2021-11-24 14:55:14 +00:00
Rory Powell 4acfc668ef Update locks, ignore oracle imports on m1 2021-11-22 15:26:31 +00:00
Rory Powell b1ac42875b Fix dependency issues on m1 2021-11-22 14:49:39 +00:00
Rory Powell f94a0eadbe Merge branch 'develop' into oracle-datasource 2021-11-22 10:47:48 +00:00
dependabot[bot] 2e09b5e855 Bump sshpk from 1.13.0 to 1.16.1 in /packages/server
Bumps [sshpk](https://github.com/joyent/node-sshpk) from 1.13.0 to 1.16.1.
- [Release notes](https://github.com/joyent/node-sshpk/releases)
- [Commits](https://github.com/joyent/node-sshpk/compare/v1.13.0...v1.16.1)

---
updated-dependencies:
- dependency-name: sshpk
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-18 10:52:11 +00:00
mike12345567 fa6875190e Downgrading typescript to match eslint required version. 2021-11-17 18:07:56 +00:00
mike12345567 7802bb1e45 Adding audit script and commiting all of the audits that it made, updating all yarn locks. 2021-11-17 18:04:16 +00:00
mike12345567 781e8359a1 Adding worker-farm back to have a mechanism to run queries within which we can timeout. 2021-11-10 19:35:09 +00:00
Rory Powell cb661eab34 Add oracledb package, readme, and config 2021-11-05 13:56:54 +00:00
Michael Drury 6feaf9b127 Merge pull request #3092 from Budibase/dependabot/npm_and_yarn/packages/server/vm2-3.9.4
Bump vm2 from 3.9.3 to 3.9.4 in /packages/server
2021-11-04 09:15:34 +00:00
Martin McKeaveney 2c5285006d fix import 2021-10-21 16:04:00 +01:00
Martin McKeaveney 3b3862bd01 Merge branch 'develop' into fix/postreleasefixes2 2021-10-21 16:00:48 +01:00
Martin McKeaveney a174de7f28 error message fixes 2021-10-19 16:52:55 +01:00
dependabot[bot] 9a09a8c9b3 Bump vm2 from 3.9.3 to 3.9.4 in /packages/server
Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.3 to 3.9.4.
- [Release notes](https://github.com/patriksimek/vm2/releases)
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/patriksimek/vm2/compare/3.9.3...3.9.4)

---
updated-dependencies:
- dependency-name: vm2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-19 15:33:24 +00:00
Rory Powell f3b630ed95 Sentry updates 2021-10-18 14:57:30 +01:00
mike12345567 fd894897ca Setting a hard limit on how many rows can be returned by the SQL plus queries. 2021-10-15 17:52:06 +01:00
Andrew Kingston 6f67a8f20e Fix issue with validity checking binding expressions 2021-10-14 12:53:56 +01:00
mike12345567 b46a945fc4 Adding the basics of the query transformers to the frontend and to the backend, as well as switching to vm2 for script running. 2021-10-12 18:45:13 +01:00
mike12345567 5bafd1c01b Fixing formula in enrichment calls, it did not retrieve the correct linked table for output processing, grouping rows for enrichment phase with their correct tables. 2021-09-30 17:54:54 +01:00
Martin McKeaveney 6f5567b4b6 merge with develop 2021-09-30 16:05:06 +01:00
Martin McKeaveney 13a07a5e51 end user ping for client apps 2021-09-30 15:03:57 +01:00
mike12345567 f8562015ac Merge branch 'develop' of github.com:Budibase/budibase into feature/cloud-export 2021-09-30 12:22:28 +01:00
Martin McKeaveney e4473a32fd fix firefox redirect loop 2021-09-29 18:59:26 +01:00
mike12345567 9f0d8a91b7 Putting together cloud export and import functionality, still need to test, but basic concept there. 2021-09-27 19:12:41 +01:00
dependabot[bot] 5f72250933 Bump tmpl from 1.0.4 to 1.0.5 in /packages/server
Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-21 20:43:58 +00:00
Martin McKeaveney e2ed2e8b56 merge from master 2021-09-21 21:42:52 +01:00
Martin McKeaveney c940df25dd updating to latest auth lib 2021-09-21 13:58:30 +01:00
Andrew Kingston c733024485 Remove merged in references to standard-components 2021-09-20 10:44:26 +01:00
Andrew Kingston a6e48194f1 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-09-20 10:33:18 +01:00
Andrew Kingston 368ada4a77 Merge branch 'develop' of github.com:Budibase/budibase into responsive-portal 2021-09-16 16:06:41 +01:00
mike12345567 def88ce397 Fixing issues with shared -> Shared directory. 2021-09-15 13:45:38 +01:00
Martin McKeaveney a0fb09fbdc upgrading to latest auth lib 2021-09-15 12:13:53 +01:00
Andrew Kingston 8a0b9724b0 Merge branch 'develop' of github.com:Budibase/budibase into responsive-portal 2021-09-15 10:53:59 +01:00
Rory Powell 73981680ba Replace 'sandbox' with 'cloud' in builder, reuse 'SELF_HOSTED' flag 2021-09-14 13:03:38 +01:00
Andrew Kingston 0c0e656b34 Make core portal layout responsive with mobile drawer menu 2021-09-13 15:38:06 +01:00
Martin McKeaveney 93590c58fa merge 2021-09-09 11:15:21 +01:00
Rory Powell 3d15db2223 Account portal cors and auth changes 2021-09-07 11:22:11 +01:00
Martin McKeaveney bcb5cb1d77 merge with master 2021-09-06 16:13:17 +01:00
mike12345567 8c3eb30ab1 Fixing issues after upgrading to node 14 and circular dependencies causing issues. 2021-09-02 18:33:41 +01:00
Martin McKeaveney 8ed415107f prevent sql relationship delete from erroring 2021-08-31 19:59:49 +01:00
Martin McKeaveney 2e4f32269b adding alphanumeric app name validation 2021-08-17 10:41:37 +01:00
mike12345567 5a45f85b1d Updating yarn locks. 2021-08-06 13:09:28 +01:00
mike12345567 46ea3f3e9e Revert "Merge pull request #2253 from Budibase/revert-2076-feature/multi-tenants"
This reverts commit 4834b765be, reversing
changes made to 2456e69483.
2021-08-05 09:59:08 +01:00
Michael Drury b86a6fddc9 Revert "Multi-tenancy/organisations" 2021-08-04 10:02:24 +01:00
mike12345567 219962cb8a Adding ability to disable/enable multi-tenancy flags easily. 2021-07-26 16:17:56 +01:00
Keviin Åberg Kultalahti c4258bfe3c implements nps form component 2021-07-19 09:28:34 +02:00
Andrew Kingston 2beaa2b28a Merge and add initial work on cards 2021-06-30 16:33:19 +01:00
Martin McKeaveney 2e4116d40a pin eslint parser to fix build 2021-06-29 17:15:13 +01:00
Andrew Kingston f2be9501d3 Add global app theme picker and use it in client preview 2021-06-28 12:55:11 +01:00
mike12345567 b6223d880e Copying none js/ts files into the dist directory after building. 2021-06-25 18:46:50 +01:00
mike12345567 96fd8ed947 Updating tests to use latest version of jest, which broke a lot of things, but was necessary to get proper ts-jest support. 2021-06-25 13:46:02 +01:00
mike12345567 ffc54c3720 First attempt and re-writing a portion of the server in typescript. 2021-06-24 18:16:48 +01:00
Michael Drury 8b4f1a4bac Update-deps and re-lint. 2021-06-21 22:44:40 +01:00
Martin McKeaveney 03c5640856 merge 2021-06-21 11:19:22 +01:00
Andrew Kingston 27009438c8 Merge branch 'master' of github.com:Budibase/budibase into feature/layout-poc 2021-06-14 09:54:11 +01:00
Martin McKeaveney 114eac4134 external/internal tables and datasources merged, removed autocapture, re-added logout action 2021-06-11 17:52:08 +01:00
Keviin Åberg Kultalahti 76954b948d remove unused components in builder settings 2021-06-11 09:19:44 +02:00
Andrew Kingston 2383e4e54a Merge branch 'master' of github.com:Budibase/budibase into interactive-layouts 2021-06-09 15:10:11 +01:00
mike12345567 9a05c52438 Merge branch 'master' of github.com:Budibase/budibase into feature/opinionated-sql 2021-06-09 13:57:23 +01:00
dependabot[bot] 091bf6ea58 Bump ws from 5.2.2 to 5.2.3 in /packages/server
Bumps [ws](https://github.com/websockets/ws) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/5.2.2...5.2.3)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-09 10:13:51 +00:00
mike12345567 ae0dbacb31 Merge branch 'master' of github.com:Budibase/budibase into feature/opinionated-sql 2021-06-09 11:03:01 +01:00