Commit Graph

35817 Commits

Author SHA1 Message Date
Martin McKeaveney 7b683cfc50 merge and typing 2024-10-08 17:38:23 +01:00
Sam Rose 5dc85230d9
Add a test to make sure 'shadowing' a field works as expected in view calculations. 2024-10-08 17:04:45 +01:00
Andrew Kingston d35fce699a
Fix config store 2024-10-08 15:59:21 +01:00
Andrew Kingston 6e0b5341b1
Handle lack of IDs from calculation views 2024-10-08 15:54:42 +01:00
Sam Rose 5c3adbed27
Validate you can't group by complex fields. 2024-10-08 15:34:34 +01:00
Sam Rose f1b04d1252
Merge master. 2024-10-08 15:06:57 +01:00
Sam Rose ad7fd46767
Merge pull request #14725 from Budibase/feature-flag-helper
Test helper for setting feature flags.
2024-10-08 14:53:38 +01:00
Sam Rose 2b47789fc8
Merge branch 'master' into feature-flag-helper 2024-10-08 14:42:09 +01:00
Andrew Kingston 7a0b0ccb34
Merge branch 'v3-ui' of github.com:Budibase/budibase into view-calculation-ui 2024-10-08 14:30:41 +01:00
Andrew Kingston c1333c66db
Fix error when deleting views 2024-10-08 14:30:10 +01:00
Andrew Kingston 3e86e02656
Add support for creating and displaying calculation views 2024-10-08 14:27:44 +01:00
Andrew Kingston 491f74e6bc
Merge branch 'v3-ui' of github.com:Budibase/budibase into view-calculation-ui 2024-10-08 14:06:52 +01:00
Andrew Kingston 76ce8b5fd5
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-08 14:06:26 +01:00
melohagan e3c6b60211
Remove unused properties (#14732)
* Remove unused properties

* lint
2024-10-08 12:56:48 +00:00
Sam Rose a82d3f310e
Merge pull request #14723 from Budibase/mark-calculation-views
Mark calculation views explicitly instead of figuring it out implicitly.
2024-10-08 12:42:52 +01:00
Sam Rose 53356a1b4d
Merge branch 'mark-calculation-views' of github.com:budibase/budibase into mark-calculation-views 2024-10-08 12:31:26 +01:00
Sam Rose 7818546ade
Fix tests. 2024-10-08 12:31:14 +01:00
Sam Rose 4f628c1d54
Merge branch 'master' of github.com:budibase/budibase into mark-calculation-views 2024-10-08 12:23:28 +01:00
Sam Rose 9b3ab049a4
wip 2024-10-08 11:50:16 +01:00
Sam Rose 1ede966863
Merge branch 'master' into mark-calculation-views 2024-10-08 11:43:46 +01:00
Sam Rose e2f4c383c6
Merge pull request #14704 from Budibase/view-calculation-validation-2
Validate that there are no duplicate calculations in calculation views.
2024-10-08 11:42:06 +01:00
Sam Rose 863ce48cfa
Merge branch 'view-calculation-validation-2' of github.com:budibase/budibase into view-calculation-validation-2 2024-10-08 11:21:49 +01:00
Sam Rose 13a78867ac
Merge branch 'master' of github.com:budibase/budibase into view-calculation-validation-2 2024-10-08 11:21:41 +01:00
Sam Rose 2d19644bd8
Fix tests. 2024-10-08 11:19:43 +01:00
Sam Rose d0c57c82ad
Fix lint. 2024-10-08 11:15:53 +01:00
Sam Rose 635d268eea
Merge branch 'master' of github.com:budibase/budibase into feature-flag-helper 2024-10-08 11:14:11 +01:00
Sam Rose c1189ecc96
Merge master. 2024-10-08 11:10:23 +01:00
Sam Rose be4bc43317
Merge pull request #14717 from Budibase/graceful-sqs-5xx-error-handling
Fix SQS error handling.
2024-10-08 10:08:02 +01:00
Sam Rose a4a90d7456
Fix tests. 2024-10-08 09:56:51 +01:00
Sam Rose 820c66be7f
Merge branch 'master' of github.com:budibase/budibase into graceful-sqs-5xx-error-handling 2024-10-08 09:42:35 +01:00
Sam Rose 989eaf108d
Merge branch 'master' into view-calculation-validation-2 2024-10-08 09:41:42 +01:00
Sam Rose ca8ed4f151
Merge pull request #14720 from Budibase/allow-calculation-fields-to-hide-required-fields
Allow calculation views to hide required fields.
2024-10-08 09:41:24 +01:00
Sam Rose 1106244ff3
Merge branch 'master' into allow-calculation-fields-to-hide-required-fields 2024-10-08 09:30:00 +01:00
Sam Rose 95b65e6edd
Merge branch 'graceful-sqs-5xx-error-handling' of github.com:budibase/budibase into feature-flag-helper 2024-10-07 18:20:40 +01:00
Sam Rose e18cc8aff2
Merge branch 'master' of github.com:budibase/budibase into graceful-sqs-5xx-error-handling 2024-10-07 18:19:56 +01:00
Sam Rose 5c092abd85
Merge branch 'master' of github.com:budibase/budibase into feature-flag-helper 2024-10-07 18:19:37 +01:00
Sam Rose 11804f6ddd
Create a feature flag helper for tests. 2024-10-07 18:18:04 +01:00
Budibase Staging Release Bot 7d6c32b8ac Bump version to 2.32.12 2024-10-07 17:15:05 +00:00
Martin McKeaveney 3d83676c03 adding missing await 2024-10-07 18:13:41 +01:00
Martin McKeaveney 2e499c2dff
Merge pull request #14724 from Budibase/fix-enterprise-vulns
Fix enterprise vulns
2024-10-07 18:03:22 +01:00
Sam Rose 2d07e63325
Merge branch 'master' into fix-enterprise-vulns 2024-10-07 17:52:32 +01:00
Martin McKeaveney 717fa00c32 allow XSS safe mode in helm chart 2024-10-07 17:48:38 +01:00
Martin McKeaveney 1e6a7b66e8 pr comments 2024-10-07 17:42:35 +01:00
Martin McKeaveney 809d292669 revert nginx prod config 2024-10-07 17:34:04 +01:00
Martin McKeaveney 12fdb930aa remove nonce 2024-10-07 17:31:45 +01:00
Sam Rose c796c11153
Merge branch 'master' of github.com:budibase/budibase into graceful-sqs-5xx-error-handling 2024-10-07 17:20:11 +01:00
Sam Rose 50f628ab53
Merge pull request #14702 from Budibase/view-calculation-validation
Validate that you cannot create a calculation view with more than 5 calculation fields.
2024-10-07 17:18:09 +01:00
Sam Rose 3e865d5609
Merge branch 'master' into view-calculation-validation 2024-10-07 17:05:18 +01:00
Sam Rose 6e4e76e21c
Merge branch 'master' into graceful-sqs-5xx-error-handling 2024-10-07 17:05:07 +01:00
Martin McKeaveney ce61af1331 XSS safe mode to prevent unsanitised input 2024-10-07 16:47:49 +01:00