Commit Graph

514 Commits

Author SHA1 Message Date
Andrew Kingston 0b2491a047 Lint and update locks 2022-06-15 15:39:38 +01:00
Andrew Kingston b5d635c83f Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-06-15 15:32:33 +01:00
mike12345567 c4ab4b5af8 Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-logs 2022-06-15 15:08:48 +01:00
Rory Powell 0054c2a502 Ensure tests can't send events even when token is set 2022-06-15 14:09:02 +01:00
Rory Powell 97bd8e01f1 Add hosting to all identities and events, add installationId to tenant group 2022-06-14 17:34:32 +01:00
Rory Powell 2dc10f611c Merge branch 'release' into develop 2022-06-14 13:57:54 +01:00
Rory Powell 780c589aa6 Export core test pkg as package.json export 2022-06-13 15:29:19 +01:00
Rory Powell af8b1ff908 Merge branch 'release' into merge-release 2022-06-13 11:58:14 +01:00
Rory Powell 0594a0ea20 Merge branch 'master' into release 2022-06-13 11:54:37 +01:00
Rory Powell 4dc5cfc5a7 Merge branch 'release' into merge-release 2022-06-13 11:45:18 +01:00
Rory Powell 12aa9fa1ce Dev improvements - remove need to rebuilds of backend-core/dist and enable debugging when running tests and backend services, use source directly using typescript and jest path mappings 2022-06-10 22:57:12 +01:00
Mel O'Hagan dc28d685a8 Removed ServiceAccount to reduce confusion 2022-06-10 14:04:34 +01:00
Rory Powell 83a5a8b5c9 Update dependencies 2022-06-09 15:30:00 +01:00
Rory Powell 396a07cac5 Merge branch 'release' into feature/event-backfill 2022-06-09 15:21:49 +01:00
Rory Powell 5c6ea05b8c Update locks 2022-06-09 13:33:31 +01:00
Rory Powell 1a7a7ac726 Build dev fixes 2022-06-09 13:15:20 +01:00
Rory Powell 0cf777a0cd Build fixes 2022-06-09 12:33:10 +01:00
Martin McKeaveney c470c2f676 merge with master 2022-06-08 13:26:14 +01:00
Mel O'Hagan 9d58b951d8 Rename Firebase to Firestore 2022-06-08 12:05:29 +01:00
Rory Powell 6a1160697d Purge lockfiles for worker, server and backend-core 2022-06-07 10:44:56 +01:00
Andrew Kingston d059433f1f Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-06-07 08:45:57 +01:00
Andrew Kingston 0c50b82248 Account for types being undefined when running in a test env 2022-06-07 08:41:45 +01:00
Rory Powell f47cee2ab6 Update lockfiles 2022-06-06 16:33:10 +01:00
Rory Powell 0a726be4bb Update types dependency 2022-06-06 11:31:57 +01:00
Rory Powell 361ffd224f Merge branch 'release' into feature/event-backfill 2022-06-06 09:50:06 +01:00
Martin McKeaveney d5540bbd57 update google sheets strategy to use the standard passport strategy 2022-06-05 16:43:04 +01:00
mike12345567 3f412f0a7a Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-logs 2022-06-01 22:41:37 +01:00
Martin McKeaveney 8cc1e4e4d0 groundwork 2022-06-01 13:03:59 +01:00
Mel O'Hagan a17411e330 Added snowflake-promise 2022-06-01 11:58:17 +01:00
Mel O'Hagan fe3a774db3 Added types and error handling 2022-05-31 11:58:03 +01:00
Mel O'Hagan 3a56712d62 Added snowflake dependency 2022-05-30 15:31:25 +01:00
Rory Powell 2a00f6498d Merge branch 'feature/posthog-v2' into feature/event-backfill 2022-05-29 00:25:40 +01:00
Rory Powell 857cd2d735 Merge branch 'develop' into feature/posthog-v2 2022-05-28 23:03:31 +01:00
Rory Powell c0d6fa34a4 Identity tenant and installation groups, property updates 2022-05-28 21:38:22 +01:00
mike12345567 27cd15da90 Updating UI after pulling in latest changes. 2022-05-27 17:11:41 +01:00
mike12345567 45c2626c14 Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-logs 2022-05-27 14:05:24 +01:00
Andrew Kingston 2f324023d9 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-27 13:32:07 +01:00
mike12345567 b8e50bba22 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-05-27 13:30:02 +01:00
mike12345567 5d5244b9f6 Merge branch 'master' of github.com:Budibase/budibase into dep/node-gyp 2022-05-27 12:45:11 +01:00
mike12345567 4cc7702d56 Adding node-gyp dependencies to dockerfiles. 2022-05-27 11:35:55 +01:00
Rory Powell 41dc87efa1 Fix provisioning in multi tenant environment 2022-05-27 10:51:23 +01:00
Rory Powell ba8c8970bc Merge pull request #6075 from Budibase/fix/provisioning-multi-tenant
Fix provisioning in multi tenant environment
2022-05-27 10:17:30 +01:00
Rory Powell 3c1b13083c Installation identities, upgrade / downgrade events, filling in more event properties 2022-05-26 23:57:14 +01:00
Rory Powell 6be1ad3aa8 Fix provisioning in multi tenant environment 2022-05-26 16:48:26 +01:00
mike12345567 8bc0142a37 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-05-25 18:12:27 +01:00
mike12345567 84d0b61588 Swapping bcryptjs for bcrypt. 2022-05-25 16:14:45 +01:00
Andrew Kingston 2cd9d4c8d7 Merge branch 'new-design-ui' of github.com:Budibase/budibase into new-design-ui 2022-05-25 13:50:04 +01:00
Andrew Kingston 1b82a965d5 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-25 13:49:28 +01:00
Rory Powell 45005217be Fix build 2022-05-24 20:09:22 +01:00
Andrew Kingston 369be5f2f6 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-24 13:36:13 +01:00
Rory Powell 5d8bd9c2a3 Merge branch 'master' into develop 2022-05-24 10:20:08 +01:00
Rory Powell b78f8eeb5f Fix pro and core versions 2022-05-24 10:11:55 +01:00
Andrew Kingston bff49a33f0 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-24 09:47:00 +01:00
mike12345567 a7e6eb2851 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-05-23 23:43:57 +01:00
Martin McKeaveney d18de6c4c9 prevent issue with TTL dependency import 2022-05-23 17:38:02 +01:00
mike12345567 76f19def26 Moving the withCache function to backend-core so that it can be shared, as well as adding a cache busting function which can be used when one of the checklist configs changes. 2022-05-23 15:03:52 +01:00
Andrew Kingston fcf682b827 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-23 11:54:24 +01:00
Rory Powell 70fff5c7b9 Merge branch 'develop' into feature/posthog-v2 2022-05-23 09:04:00 +01:00
mike12345567 513d901ab4 Adding user load testing script. 2022-05-22 17:14:24 +01:00
mike12345567 663f5aef7b Merge branch 'develop' of github.com:Budibase/budibase into feature/portal-usage 2022-05-19 10:45:26 +01:00
Andrew Kingston 6f6d7da70f Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-19 09:11:13 +01:00
Rory Powell 2ce76881f2 Merge branch 'master' into merge-master 2022-05-18 14:24:35 +01:00
mike12345567 e61efc5474 Merge branch 'develop' of github.com:Budibase/budibase into feature/portal-usage 2022-05-18 10:56:44 +01:00
mike12345567 c528896e2d Finishing off UI, expanding settings menus from 80ch to 90ch as they were quite restricted and made the usage UI a bit difficult to view. Added a DISABLE_DEVELOPER_LICENSE env variable for testing. 2022-05-17 17:44:40 +01:00
Andrew Kingston 08a98b4b95 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-17 12:59:15 +01:00
Rory Powell 5ff2d2a538 Add explicit bson dependency version instead of * to fix build 2022-05-17 11:03:54 +01:00
Rory Powell 39e8a2bc10 Fix release build 2022-05-17 10:11:58 +01:00
Rory Powell fb18904ad8 Fix tests and build 2022-05-17 10:05:05 +01:00
Rory Powell 0d9147be77 Merge branch 'master' into merge-master 2022-05-17 08:35:29 +01:00
mike12345567 9ced247cc2 Updating yarnlocks. 2022-05-16 12:35:25 +01:00
mike12345567 08f53591e6 Fixing test cases. 2022-05-16 12:31:07 +01:00
Rory Powell 30c12f2625 Merge branch 'master' into merge-master 2022-05-13 10:05:21 +01:00
Rory Powell 1716328a77 Update lockfiles 2022-05-12 15:51:14 +01:00
mike12345567 0218ba5210 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-05-11 19:47:22 +01:00
mike12345567 3f6e8bf5ea Start of automation logs for #4977 - implementing some of the UI. 2022-05-11 19:40:13 +01:00
Rory Powell b5e25e125c Bump pro 2022-05-11 11:57:55 +01:00
Andrew Kingston 876cb4784d Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-11 09:07:35 +01:00
Rory Powell 879a62c989 Add query quota increment to rows CRUD 2022-05-10 21:59:39 +01:00
Rory Powell e134400465 Merge branch 'master' into merge-master 2022-05-09 14:22:01 +01:00
mike12345567 7693de8a61 Merge branch 'master' of github.com:Budibase/budibase into fix/5778 2022-05-09 13:46:38 +01:00
Rory Powell 59ab628b85 Fix pro version 2022-05-09 12:55:13 +01:00
mike12345567 8e704cc70f Fixing issue #5778 - making sure to only remove the first app_ element of the app ID. 2022-05-09 12:29:44 +01:00
Andrew Kingston b89203cd45 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-09 09:41:28 +01:00
Rory Powell e4976eb320 Fix lockfile 2022-05-05 10:04:33 +01:00
Rory Powell 34474d5c10 Re-enable gsheets for verification 2022-05-05 09:59:10 +01:00
Rory Powell e4257f1e04 Merge branch 'develop' into feature/posthog-v2 2022-05-05 08:47:06 +01:00
Andrew Kingston 7b96ba811c Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-05 08:26:37 +01:00
Rory Powell 7f77d895ce Merge branch 'master' into merge-master-develop 2022-05-04 13:29:51 +01:00
mike12345567 dfb292862f Fixing an issue with JSONparse helper always being considered invalid due to a lack of input. 2022-05-04 12:14:01 +01:00
mike12345567 c66cbcd522 Fix for automation issue, doInAppContext for automation thread wasn't async, was immediately closing the database, rather than waiting for the operations to complete. 2022-05-03 15:54:03 +01:00
mike12345567 d090f2a8aa Fix for #5553 - when importing for SQL databases attempt to manage date and time only column times, handle these when displaying in tables and when filtering. 2022-05-03 14:11:06 +01:00
dependabot[bot] 7de264c0e2 Bump ejs from 3.1.6 to 3.1.7 in /packages/server
Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.7.
- [Release notes](https://github.com/mde/ejs/releases)
- [Changelog](https://github.com/mde/ejs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mde/ejs/compare/v3.1.6...v3.1.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-03 12:48:58 +00:00
Rory Powell a9717f3b8f Add workflow_dispatch to ci, release-develop and release 2022-05-03 13:27:22 +01:00
Rory Powell 185b591db5 Merge branch 'labday/backend-core-ts' into feature/posthog-v2 2022-04-29 14:01:13 +01:00
Rory Powell cfa75a8af3 backend-core typescript building successfully 2022-04-28 22:39:21 +01:00
Andrew Kingston 1db3ae2974 Add support for instant updating of navigation settings in client apps 2022-04-28 17:30:48 +01:00
Rory Powell 1caf4b1965 Merge branch 'develop' into feature/posthog-v2 2022-04-27 16:32:00 +01:00
mike12345567 48eda78f67 Fix for issue being able to delete apps. 2022-04-27 15:58:55 +01:00
Rory Powell 7160db6466 Decrement pro version to pass release 2022-04-27 10:09:59 +01:00
Andrew Kingston b42161bfd5 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-04-27 07:59:37 +01:00