1
0
Fork 0
mirror of synced 2024-07-01 20:41:03 +12:00
Commit graph

849 commits

Author SHA1 Message Date
Andrew Kingston a335b8cab5 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-06-20 13:28:26 +01:00
Rory Powell 35a6eef9f3 Update workflow readmes and rename release staging to prerelease 2022-06-20 13:27:03 +01:00
Rory Powell 9a587f020d Add dispatch deploy job for release env 2022-06-20 12:14:16 +01:00
Mel O'Hagan 5f9944af34 Add empty options if missing for delete 2022-06-17 16:54:23 +01:00
mike12345567 e761dc20c0 Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-logs 2022-06-17 15:05:46 +01:00
mike12345567 31c4459796 Adding back dependencies. 2022-06-17 14:12:04 +01:00
mike12345567 a46d73931d Merge branch 'master' of github.com:Budibase/budibase into develop 2022-06-17 11:41:34 +01:00
Andrew Kingston ac02d78082 Lint and update locks 2022-06-15 15:39:38 +01:00
Andrew Kingston 15c28bcb8f Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-06-15 15:32:33 +01:00
mike12345567 03165faf0f Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-logs 2022-06-15 15:08:48 +01:00
Rory Powell acbb411a0a Ensure tests can't send events even when token is set 2022-06-15 14:09:02 +01:00
Rory Powell cfad5af382 Add hosting to all identities and events, add installationId to tenant group 2022-06-14 17:34:32 +01:00
Rory Powell 23fe45a876 Merge branch 'release' into develop 2022-06-14 13:57:54 +01:00
Rory Powell 2661c4b408 Export core test pkg as package.json export 2022-06-13 15:29:19 +01:00
Rory Powell 05aca077d1 Merge branch 'release' into merge-release 2022-06-13 11:58:14 +01:00
Rory Powell b9f17827fe Merge branch 'master' into release 2022-06-13 11:54:37 +01:00
Rory Powell 05f0393310 Merge branch 'release' into merge-release 2022-06-13 11:45:18 +01:00
Rory Powell a2b9fcd448 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 aedda40891 Removed ServiceAccount to reduce confusion 2022-06-10 14:04:34 +01:00
Rory Powell 872e4f7a3b Update dependencies 2022-06-09 15:30:00 +01:00
Rory Powell b1b852b72c Merge branch 'release' into feature/event-backfill 2022-06-09 15:21:49 +01:00
Rory Powell 2018cd4922 Update locks 2022-06-09 13:33:31 +01:00
Rory Powell d1f4666ab7 Build dev fixes 2022-06-09 13:15:20 +01:00
Rory Powell e447fd11d1 Build fixes 2022-06-09 12:33:10 +01:00
Martin McKeaveney 80a0c59c8a merge with master 2022-06-08 13:26:14 +01:00
Mel O'Hagan 91b97698a6 Rename Firebase to Firestore 2022-06-08 12:05:29 +01:00
Rory Powell 98a92c0ad2 Purge lockfiles for worker, server and backend-core 2022-06-07 10:44:56 +01:00
Andrew Kingston 17da8f192f Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-06-07 08:45:57 +01:00
Andrew Kingston 3a9e4fff87 Account for types being undefined when running in a test env 2022-06-07 08:41:45 +01:00
Rory Powell d5a945ed67 Update lockfiles 2022-06-06 16:33:10 +01:00
Rory Powell 23b1aea277 Update types dependency 2022-06-06 11:31:57 +01:00
Rory Powell 4e77571ddb Merge branch 'release' into feature/event-backfill 2022-06-06 09:50:06 +01:00
Martin McKeaveney 493607b853 update google sheets strategy to use the standard passport strategy 2022-06-05 16:43:04 +01:00
mike12345567 7fbe63420c Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-logs 2022-06-01 22:41:37 +01:00
Martin McKeaveney f12302059b groundwork 2022-06-01 13:03:59 +01:00
Mel O'Hagan 33309c0fb7 Added snowflake-promise 2022-06-01 11:58:17 +01:00
Mel O'Hagan 31aa9418dd Added types and error handling 2022-05-31 11:58:03 +01:00
Mel O'Hagan 647870572e Added snowflake dependency 2022-05-30 15:31:25 +01:00
Rory Powell f2f6bf779d Merge branch 'feature/posthog-v2' into feature/event-backfill 2022-05-29 00:25:40 +01:00
Rory Powell 64d73e2f96 Merge branch 'develop' into feature/posthog-v2 2022-05-28 23:03:31 +01:00
Rory Powell 9610d8f1e7 Identity tenant and installation groups, property updates 2022-05-28 21:38:22 +01:00
mike12345567 c01c35386b Updating UI after pulling in latest changes. 2022-05-27 17:11:41 +01:00
mike12345567 bbdc5abc28 Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-logs 2022-05-27 14:05:24 +01:00
Andrew Kingston 6b905da588 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-27 13:32:07 +01:00
mike12345567 05dc8931af Merge branch 'master' of github.com:Budibase/budibase into develop 2022-05-27 13:30:02 +01:00
mike12345567 12a3af4583 Merge branch 'master' of github.com:Budibase/budibase into dep/node-gyp 2022-05-27 12:45:11 +01:00
mike12345567 003861dc4f Adding node-gyp dependencies to dockerfiles. 2022-05-27 11:35:55 +01:00
Rory Powell 967fc8a397 Fix provisioning in multi tenant environment 2022-05-27 10:51:23 +01:00
Rory Powell 37b734731c
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 398a4e7034 Installation identities, upgrade / downgrade events, filling in more event properties 2022-05-26 23:57:14 +01:00
Rory Powell ab54ae29ab Fix provisioning in multi tenant environment 2022-05-26 16:48:26 +01:00
mike12345567 09f8675816 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-05-25 18:12:27 +01:00
mike12345567 157802b70a Swapping bcryptjs for bcrypt. 2022-05-25 16:14:45 +01:00
Andrew Kingston 4f1f2abf21 Merge branch 'new-design-ui' of github.com:Budibase/budibase into new-design-ui 2022-05-25 13:50:04 +01:00
Andrew Kingston 245a074317 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-25 13:49:28 +01:00
Rory Powell 6aea03fd44 Fix build 2022-05-24 20:09:22 +01:00
Andrew Kingston f4eb6f36bd Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-24 13:36:13 +01:00
Rory Powell ef13d6a821 Merge branch 'master' into develop 2022-05-24 10:20:08 +01:00
Rory Powell 105785a754 Fix pro and core versions 2022-05-24 10:11:55 +01:00
Andrew Kingston 949ab2dac6 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-24 09:47:00 +01:00
mike12345567 d535afa542 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-05-23 23:43:57 +01:00
Martin McKeaveney 73404a6fb3 prevent issue with TTL dependency import 2022-05-23 17:38:02 +01:00
mike12345567 100f5a6f3c 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 a494aec6c6 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-23 11:54:24 +01:00
Rory Powell 80a82bbcc3 Merge branch 'develop' into feature/posthog-v2 2022-05-23 09:04:00 +01:00
mike12345567 223a3ae5e0 Adding user load testing script. 2022-05-22 17:14:24 +01:00
mike12345567 7437eb4513 Merge branch 'develop' of github.com:Budibase/budibase into feature/portal-usage 2022-05-19 10:45:26 +01:00
Andrew Kingston 109ca7dbef Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-19 09:11:13 +01:00
Rory Powell 99ebb96f3e Merge branch 'master' into merge-master 2022-05-18 14:24:35 +01:00
mike12345567 39806d470d Merge branch 'develop' of github.com:Budibase/budibase into feature/portal-usage 2022-05-18 10:56:44 +01:00
mike12345567 36a190b0ed 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 0133aabc46 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-17 12:59:15 +01:00
Rory Powell f549f38b16 Add explicit bson dependency version instead of * to fix build 2022-05-17 11:03:54 +01:00
Rory Powell a056027bf3 Fix release build 2022-05-17 10:11:58 +01:00
Rory Powell eb935cf143 Fix tests and build 2022-05-17 10:05:05 +01:00
Rory Powell b1c5f09651 Merge branch 'master' into merge-master 2022-05-17 08:35:29 +01:00
mike12345567 227ed0fb67 Updating yarnlocks. 2022-05-16 12:35:25 +01:00
mike12345567 bcf7e1782a Fixing test cases. 2022-05-16 12:31:07 +01:00
Rory Powell 8f121852b0 Merge branch 'master' into merge-master 2022-05-13 10:05:21 +01:00
Rory Powell 20076e69d7 Update lockfiles 2022-05-12 15:51:14 +01:00
mike12345567 b6499c911c Merge branch 'master' of github.com:Budibase/budibase into develop 2022-05-11 19:47:22 +01:00
mike12345567 da1d53e6ab Start of automation logs for #4977 - implementing some of the UI. 2022-05-11 19:40:13 +01:00
Rory Powell a269f123a1 Bump pro 2022-05-11 11:57:55 +01:00
Andrew Kingston e25123eade Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-11 09:07:35 +01:00
Rory Powell f5da1a04e2 Add query quota increment to rows CRUD 2022-05-10 21:59:39 +01:00
Rory Powell 631aebba06 Merge branch 'master' into merge-master 2022-05-09 14:22:01 +01:00
mike12345567 1b1938950f Merge branch 'master' of github.com:Budibase/budibase into fix/5778 2022-05-09 13:46:38 +01:00
Rory Powell 150c4c3937 Fix pro version 2022-05-09 12:55:13 +01:00
mike12345567 7b461c03dd 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 ba8d8bfd1b Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-09 09:41:28 +01:00
Rory Powell a35824d50e Fix lockfile 2022-05-05 10:04:33 +01:00
Rory Powell 2cfb7be30a Re-enable gsheets for verification 2022-05-05 09:59:10 +01:00
Rory Powell 3e254e46bb Merge branch 'develop' into feature/posthog-v2 2022-05-05 08:47:06 +01:00
Andrew Kingston c18f66452c Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-05 08:26:37 +01:00
Rory Powell 2fb532e1e8 Merge branch 'master' into merge-master-develop 2022-05-04 13:29:51 +01:00
mike12345567 6ffeaab597 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 d666ad3126 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 107c9e2dfc 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] 40d2146b7c
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 f7b568d37f Add workflow_dispatch to ci, release-develop and release 2022-05-03 13:27:22 +01:00
Rory Powell 1e7e6bdab8 Merge branch 'labday/backend-core-ts' into feature/posthog-v2 2022-04-29 14:01:13 +01:00
Rory Powell 36f7358a20 backend-core typescript building successfully 2022-04-28 22:39:21 +01:00
Andrew Kingston ff6f02dda4 Add support for instant updating of navigation settings in client apps 2022-04-28 17:30:48 +01:00
Rory Powell bd33c827eb Merge branch 'develop' into feature/posthog-v2 2022-04-27 16:32:00 +01:00
mike12345567 4a02f7f9aa Fix for issue being able to delete apps. 2022-04-27 15:58:55 +01:00
Rory Powell 51ca618558 Decrement pro version to pass release 2022-04-27 10:09:59 +01:00
Andrew Kingston 76feddfaff Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-04-27 07:59:37 +01:00
Michael Drury 8e786bfd53 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-04-26 20:10:26 +01:00
mike12345567 95bcb1ca9c Fixing issue with db init as part of the jest require. 2022-04-26 18:28:37 +01:00
mike12345567 8e5c4dea77 Fixing context issues in sync apps/rows test cases. 2022-04-26 15:42:21 +01:00
Rory Powell 0f29b0cb03 Test fixes 2022-04-26 15:07:21 +01:00
Martin McKeaveney e01ef9bdfb merge with master 2022-04-26 10:21:45 +01:00
Rory Powell 0f04715062 Fix: google sso 2022-04-25 22:49:56 +01:00
Rory Powell b7cbd2a56a Fix developer count migration when only single developer 2022-04-25 15:38:37 +01:00
Andrew Kingston f463a8d661 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui-dirty 2022-04-25 14:38:52 +01:00
Martin McKeaveney ff7ad47b0a PR review 2022-04-25 11:45:15 +01:00
Martin McKeaveney b05d1d9708 merge 2022-04-25 10:24:49 +01:00
Rory Powell 1edf879db7 fix versions 2022-04-22 16:18:27 +01:00
Vinoth Kirubakaran 3fe651b0fb chore: resolved merge conflicts from develop branch 2022-04-22 15:23:05 +05:30
Rory Powell df5f9c1fef Pro build fixes 2022-04-22 09:43:51 +01:00
Martin McKeaveney 690ba4f81f use ioredis mock for in memory redis tests 2022-04-21 20:24:43 +01:00
Rory Powell e62858be8b Add explicit pro dependency to worker and server 2022-04-21 15:08:14 +01:00
mike12345567 7792a07899 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 5803fcc6b1 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 5085358423 Merge branch 'develop' into feature/licensing 2022-04-13 21:24:07 +01:00
dependabot[bot] 42c5611946
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 23b68660c2 Merge branch 'feature/licensing' into feature/posthog-v2 2022-04-12 17:12:46 +01:00
Rory Powell dd740df387 Merge branch 'develop' into feature/licensing 2022-04-12 16:18:41 +01:00
Rory Powell 2c682d3507 Table CRUD events + add timekeeper for tests 2022-04-11 14:39:31 +01:00
Martin McKeaveney 6d8254d5f0 redis integration complete 2022-03-31 15:44:06 +01:00
Rory Powell 3e08e8d5de update server lockfile 2022-03-28 09:50:52 +01:00
Rory Powell 77e43e0661 Merge branch 'feature/licensing' into feature/posthog-v2 2022-03-28 09:47:34 +01:00
dependabot[bot] f318379d7f
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 7f79b30b58 clean and bootstrap 2022-03-25 13:14:44 +00:00
Rory Powell 0ee41ea10c Merge branch 'master' into merge-master 2022-03-25 13:10:37 +00:00
Rory Powell 1922bd1fcb Add analytics to backend-core. Update server posthog usage 2022-03-25 13:04:34 +00:00
Rory Powell 70c54e983d Add typescript linting at the top level 2022-03-25 11:17:58 +00:00
Rory Powell 98a12be546 Revert lock files 2022-03-24 13:53:47 +00:00
Andrew Kingston 8e361afcda Allow deep-getting of pagination params from REST responses 2022-03-24 10:07:23 +00:00
Rory Powell cb6103a321 Fix cross tenant apps with session 2022-03-23 16:45:06 +00:00
mike12345567 9597bcc742 Adding a fix for #4996 - checks if WSL is in use when configuring nginx. 2022-03-23 15:31:08 +00:00
Rory Powell 180e37b9f1 Tests complete + backwards compatibility for deployment 2022-03-22 00:23:22 +00:00
Rory Powell bf9f5488fc Merge branch 'develop' into feature/licensing 2022-03-21 17:13:16 +00:00
mike12345567 ffad3a4bb6 Updating yarn locks. 2022-03-14 12:00:44 +00:00
Martin McKeaveney d7637a9c11 update yarn lock 2022-03-10 13:33:10 +00:00
Rory Powell ccf2fe3d01 Self Host <-> Licensing integration 2022-03-09 21:16:22 +00:00
mike12345567 2123fca557 Fixing various other ms-sql types. 2022-03-04 13:48:21 +00:00
Rory Powell 3b9303a1fb Enforce licensed developer count + error types/codes framework 2022-03-04 13:42:50 +00:00
Rory Powell 515ade6bd3 Add shared licensing cache 2022-03-03 13:37:04 +00:00
mike12345567 54137ec9fb Removing koa rate limit types, was requiring types for every store, types didn't work correctly. 2022-03-03 12:19:12 +00:00