1
0
Fork 0
mirror of synced 2024-07-05 22:40:39 +12:00
Commit graph

30941 commits

Author SHA1 Message Date
mike12345567 798be434b4 Updating rollup after weird merge issues. 2024-04-26 12:26:34 +01:00
mike12345567 6cf2da7944 Pro version to master. 2024-04-26 11:10:13 +01:00
mike12345567 53a02da8c1 Merge branch 'master' of github.com:Budibase/budibase into fix/upgrade-rollup 2024-04-26 11:04:07 +01:00
José Vte. Calderón b7ea425d7e
Merge pull request #13562 from Budibase/feature/enterprise-basic-trial
[Added] New plan ENTERPRISE_BASIC_TRIAL
2024-04-26 09:22:11 +02:00
jvcalderon d32623c340 Restore account portal submodule 2024-04-26 09:15:36 +02:00
jvcalderon fe68abe6de Upgrade pro and account-portal submodules 2024-04-26 08:55:49 +02:00
mike12345567 22a67eb769 Matching rollup version across all packages, there was a lot of mis-match and I was running into some build issues due to this, getting everything on the same version so that they can all use the same package - this also requires updating all .js extensions to .mjs to correctly support the imports. 2024-04-25 18:43:54 +01:00
José Vte. Calderón 33be48ff1f
Merge branch 'master' into feature/enterprise-basic-trial 2024-04-25 13:56:16 +02:00
Andrew Kingston 8a72be5fab
Merge pull request #13510 from Budibase/grid-enhancements
Table enhancements
2024-04-25 12:53:57 +01:00
jvcalderon 4615d9c61c Restore yarn.lock 2024-04-25 13:51:52 +02:00
Andrew Kingston 589bb1cf92
Merge branch 'master' into grid-enhancements 2024-04-25 12:49:55 +01:00
Adria Navarro 6166410d6e
Merge pull request #13559 from Budibase/chore/resolve-oss-pro-via-yarn-resolutions
Resolve oss pro via yarn resolutions
2024-04-25 13:00:04 +02:00
jvcalderon d4c0f489c8 Update Submodules 2024-04-25 12:02:23 +02:00
jvcalderon c79ea9b067 Adds ENTERPRISE_BASIC_TRIAL 2024-04-25 12:01:45 +02:00
Adria Navarro dfdc4a77c8 Update yarn.lock 2024-04-25 11:44:41 +02:00
Adria Navarro ba73a64065
Merge branch 'master' into chore/resolve-oss-pro-via-yarn-resolutions 2024-04-25 11:31:54 +02:00
Adria Navarro e48c51b086 Remove 2024-04-25 11:23:08 +02:00
Adria Navarro a2faf57b46 Use @budibase/pro resolution 2024-04-25 11:22:52 +02:00
Sam Rose 57e9ad8196
Merge pull request #13551 from Budibase/dependabot/npm_and_yarn/packages/server/mysql2-3.9.7
Bump mysql2 from 3.5.2 to 3.9.7 in /packages/server
2024-04-25 10:22:28 +01:00
Andrew Kingston 8baea1974d
Merge branch 'master' into grid-enhancements 2024-04-25 09:54:21 +01:00
jvcalderon a18264332c Lint 2024-04-25 10:51:10 +02:00
Sam Rose a9b653b818
Merge branch 'master' into dependabot/npm_and_yarn/packages/server/mysql2-3.9.7 2024-04-25 09:44:58 +01:00
Michael Drury adcbb3dd1e
Merge pull request #13558 from Budibase/revert-13557-fix/pre-sign-client-lib
Revert "Changing client library to be retrieved via pre-signed URL for Cloud"
2024-04-24 17:12:50 +01:00
Michael Drury 2187d25711
Revert "Changing client library to be retrieved via pre-signed URL for Cloud" 2024-04-24 17:12:36 +01:00
Michael Drury 36aacd4d11
Merge pull request #13557 from Budibase/fix/pre-sign-client-lib
Changing client library to be retrieved via pre-signed URL for Cloud
2024-04-24 16:17:03 +01:00
mike12345567 f76abb0ca9 Getting rid of linting error. 2024-04-24 15:59:11 +01:00
mike12345567 849253faba Bringing back the old mechanism of returning the client library through a pre-signed URL, rather than always serving through the service. 2024-04-24 15:37:47 +01:00
Sam Rose 0cbf6aa613
Merge branch 'master' into dependabot/npm_and_yarn/packages/server/mysql2-3.9.7 2024-04-24 15:06:53 +01:00
Budibase Staging Release Bot 2fc96549aa Bump version to 2.23.12 2024-04-24 12:05:06 +00:00
dependabot[bot] c8446fa5a6
Bump mysql2 from 3.5.2 to 3.9.7 in /packages/server
Bumps [mysql2](https://github.com/sidorares/node-mysql2) from 3.5.2 to 3.9.7.
- [Release notes](https://github.com/sidorares/node-mysql2/releases)
- [Changelog](https://github.com/sidorares/node-mysql2/blob/master/Changelog.md)
- [Commits](https://github.com/sidorares/node-mysql2/compare/v3.5.2...v3.9.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-23 22:12:24 +00:00
Peter Clement b080821f29
Update helm charts to account for temp bucket (#13544)
* update helm charts to account for temp bucket

* typo

* move location of vars
2024-04-23 10:31:18 +01:00
Peter Clement a4c0328c53
REST file handling and SMTP automation block attachments (#13403)
* handle files in rest connector

* fetch presigned url and return

* further updates to handle files in rest connector

* remove unused important and fix extension bug

* wrong expiry param

* tests

* add const for temp bucket

* handle ttl on bucket

* more bucket ttl work

* split out fileresponse and xmlresponse into utils

* lint

* remove log

* fix tests

* some pr comments

* update function naming and lint

* adding back needed response for frontend

* use fsp

* handle different content-disposition and potential path traversal

* add test container for s3 / minio

* add test case for filename* and ascii filenames

* move tests into separate describe

* remove log

* up timeout

* switch to minio image instead of localstack

* use minio image instead of s3 for testing

* stream file upload instead

* use streamUpload and update signatures

* update bucketcreate return

* throw real error

* tidy up

* pro

* pro ref fix?

* pro fix

* pro fix?

* move minio test provider to backend-core

* update email builder to allow attachments

* testing for sending files via smtp

* use backend-core minio test container in server

* handle different types of url

* fix minio test provider

* test with container host

* lint

* try different hostname?

* Revert "try different hostname?"

This reverts commit cfefdb8ded.

* fix issue with fetching of signed url with test minio

* update autoamtion attachments to take filename and url

* fix tests

* pro ref

* fix parsing of url object

* pr comments and linting

* pro ref

* fix pro again

* fix pro

* account-portal

* fix null issue

* fix ref

* ref

* When sending a file attachment in email fetch it directly from our object store

* add more checks to ensure we're working with a signed url

* update test to account for direct object store read

* formatting

* fix time issues within test

* update bucket and path extraction to regex

* use const in regex

* pro

* Updating TTL handling in upload functions (#13539)

* Updating TTL handling in upload functions

* describe ttl type

* account for ttl creation in existing buckets and update types

* fix tests

* pro

* pro
2024-04-22 15:30:57 +00:00
Budibase Staging Release Bot b2f81276cd Bump version to 2.23.11 2024-04-22 14:14:24 +00:00
Michael Drury d0fd19a0bc
Merge pull request #13531 from Budibase/fix/readable-helpers-handling
Fix readable/runtime conversion with helpers
2024-04-22 12:37:56 +01:00
mike12345567 0266be8138 Quick fix - no need to double check. 2024-04-22 12:26:30 +01:00
Michael Drury adfe3b944b
Merge branch 'master' into fix/readable-helpers-handling 2024-04-22 12:23:58 +01:00
Michael Drury d1ca5c4455
Merge pull request #13540 from Budibase/fix/13535
Fix docker-compose/docker compose error in Budibase CLI
2024-04-22 12:15:43 +01:00
mike12345567 a18799a139 Getting rid of previous check for docker-compose/docker compose as due to recent changes there is no alias for the docker compose command anymore to find. 2024-04-22 11:50:08 +01:00
Andrew Kingston bff6340763
Merge pull request #13529 from Budibase/fix/clear-empty-filter-when-all-fields-are-removed
Fix for onEmptyFilter getting stuck on internal datasource filters.
2024-04-22 10:21:03 +01:00
deanhannigan f4ea7bb13b
Merge branch 'master' into fix/clear-empty-filter-when-all-fields-are-removed 2024-04-22 09:20:44 +01:00
José Vte. Calderón 16582f3bab
Merge pull request #13530 from Budibase/feature/premium-plus-trial
[Added] PREMIUM_PLUS_TRIAL type
2024-04-22 10:18:23 +02:00
Dean ed3073a20d PR feedback 2024-04-22 09:12:05 +01:00
jvcalderon 51933c1244 Update submodules 2024-04-22 10:11:41 +02:00
Dean 50d933dd01 Merge remote-tracking branch 'origin/master' into fix/clear-empty-filter-when-all-fields-are-removed 2024-04-22 09:05:53 +01:00
mike12345567 0b830ae2e2 Fixing formulas not being converted back to readable. 2024-04-19 17:05:34 +01:00
José Vte. Calderón 4210792dd0
Merge branch 'master' into feature/premium-plus-trial 2024-04-19 17:58:02 +02:00
mike12345567 d328647447 Removing accidental import. 2024-04-19 16:49:58 +01:00
mike12345567 659efe67d7 Adding edge case handling to the binding readable/runtime conversion, checking if it is trying to replace a binding which a substring of a helper name, which causes the helper to become un-usable. 2024-04-19 16:40:45 +01:00
Andrew Kingston a2893ec2cc
Merge pull request #13427 from Budibase/borderless-grid
Quiet option for grid blocks (new table component)
2024-04-19 16:29:54 +01:00
Andrew Kingston a70560015c
Merge branch 'master' into borderless-grid 2024-04-19 16:25:58 +01:00