Commit Graph

1751 Commits

Author SHA1 Message Date
mike12345567 83875cd2d6 Merge branch 'develop' of github.com:Budibase/budibase into merge-master-develop 2023-09-05 12:29:27 +01:00
mike12345567 d096f359d7 Revert "Revert "Merge branch 'develop' into master""
This reverts commit 3265042025.
2023-09-05 12:28:56 +01:00
Adria Navarro 2c70543d5c Merge branch 'develop' into BUDI-7189/fix/legacy_views_permissions 2023-09-04 12:34:19 +02:00
Adria Navarro d68d449f1f DRY 2023-09-04 12:11:59 +02:00
Adria Navarro a012c0a458 Add back base default legacy views permissions 2023-09-04 12:00:58 +02:00
Adria Navarro bb8aacd830 Improve messaging 2023-09-01 17:23:47 +02:00
Adria Navarro 0dc03abe5f Display dependant info 2023-09-01 17:03:33 +02:00
Rory Powell 64af549341 Revert "Merge pull request #11489 from Budibase/fix/automation-disable"
This reverts commit e6319cce67, reversing
changes made to 7c12280fe3.
2023-09-01 15:12:23 +01:00
Adria Navarro 5b7756936d Change api interfaces 2023-09-01 11:33:59 +02:00
Adria Navarro 5d870fb41a Rename 2023-09-01 09:50:55 +02:00
Adria Navarro 774ff745b6 Return role origin 2023-09-01 09:40:29 +02:00
Adria Navarro cefb57d78a Merge branch 'develop' into views-v2-frontend 2023-08-30 15:12:56 +02:00
Martin McKeaveney 3265042025 Revert "Merge branch 'develop' into master"
This reverts commit 99adc2039b, reversing
changes made to fec20e526e.
2023-08-29 14:27:39 +01:00
Adria Navarro ce11a5a852 Lock feature based on ff 2023-08-29 12:47:15 +02:00
Andrew Kingston a22fc8d208 Merge branch 'develop' of github.com:Budibase/budibase into views-v2-frontend 2023-08-24 12:07:23 +01:00
Adria Navarro bfa2b491f3 Allow view permission type 2023-08-24 10:22:08 +02:00
Adria Navarro 1a88a9078d Merge branch 'develop' into BUDI-7393-view-permissions-behind-feature-flag 2023-08-24 08:39:53 +02:00
Adria Navarro 664f257239 Implemment checks 2023-08-22 11:27:06 +03:00
mike12345567 466a2504e4 Updating pro and some types for per app builder group support. 2023-08-21 18:02:09 +01:00
Andrew Kingston 6d46fb2963 Merge branch 'develop' of github.com:Budibase/budibase into views-v2-frontend 2023-08-21 11:57:28 +01:00
Andrew Kingston 0566644508 Allow view searching and sorting. Refactor grid logic to fix multiple issuies 2023-08-21 11:56:58 +01:00
Adria Navarro 5dca30986e Merge branch 'develop' into chore/fix_os_contributor 2023-08-21 10:27:22 +03:00
Adria Navarro 05be953647 Shared and types are commonjs (for pro users) 2023-08-21 10:06:37 +03:00
mike12345567 ef0d4f7c73 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108 2023-08-18 15:07:36 +01:00
mike12345567 188004021a linting. 2023-08-18 14:40:04 +01:00
mike12345567 a5a1c62eb1 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108 2023-08-18 14:34:08 +01:00
mike12345567 7110351bdc Revert "revert develop into master"
This reverts commit fd099658a0.
2023-08-18 14:33:21 +01:00
mike12345567 aef7f28ccb Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108 2023-08-18 13:30:47 +01:00
mike12345567 621b1fadea Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108 2023-08-18 13:22:34 +01:00
Michael Drury df31fb1b8d Merge branch 'develop' into fix/automation-improvements 2023-08-17 17:35:02 +01:00
mike12345567 e174211440 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-08-17 17:34:44 +01:00
melohagan b57a8c1130 Move when filter empty option into filter drawer (#11262)
* Add when filter empty dropdown

* Add unit tests

* "fix" typescript issue

* Add empty filter check for external

* Add unit test

* Hide empty filter option for custom query

* Make onEmptyFilter optional

* Fix unit tests

* Remove onEmptyFilter automation input

* Remove unused var

* Refactor

* Fix path

* Fix type issue

* Fix types
2023-08-17 13:31:52 +01:00
Martin McKeaveney fd099658a0 revert develop into master 2023-08-17 10:28:15 +01:00
mike12345567 e068e301ff Updating automation history tab to handle the stopped error status which can occur for CRONs. 2023-08-16 18:21:53 +01:00
mike12345567 8f81a16340 Updating types to be based on the open API definition rather than types. 2023-08-15 17:33:22 +01:00
mike12345567 a6a70c2d09 Building out the role assignment/unassignment APIs as new components of the public API. 2023-08-15 16:46:21 +01:00
mike12345567 b3e8989060 Adding pro integration. 2023-08-15 14:19:36 +01:00
mike12345567 9e0964a5e3 Removing concept of columns and schemaUI, replacing with just schema as now the backend uses UI attributes. 2023-08-11 15:52:13 +01:00
mike12345567 60af4029aa Merge branch 'develop' of github.com:Budibase/budibase into BUDI-7189/handle_tableschema_changes_on_views 2023-08-11 14:15:21 +01:00
Michael Drury 9a19c7a14e Merge branch 'develop' into budi-7350-filter-equal-for-numbers-not-working-in-data-providers 2023-08-10 16:35:36 +01:00
Michael Drury 08e663a8d3 Merge branch 'master' into budi-7350-filter-equal-for-numbers-not-working-in-data-providers 2023-08-10 16:28:59 +01:00
Adria Navarro f6838631b0 Merge branch 'develop' into master-backmerge-20230810 2023-08-10 15:32:00 +03:00
mike12345567 d6da826c9f Further PR comments. 2023-08-10 11:07:25 +01:00
Michael Drury 567d9eeafe Merge branch 'develop' into feature/view-api-merge 2023-08-10 11:04:56 +01:00
Michael Drury f7d94e1864 Merge branch 'master' into fix/automation-disable 2023-08-09 17:13:14 +01:00
Michael Drury b1e25939f5 Merge branch 'develop' into BUDI-7189/handle_tableschema_changes_on_views 2023-08-09 16:28:50 +01:00
mike12345567 63006e36d4 Adding the ability to disable an automation, as well making sure that automations have steps before running. 2023-08-09 16:24:57 +01:00
Adria Navarro 9e6bfaa958 Merge branch 'develop' into backmerge-20230809 2023-08-09 17:36:31 +03:00
Adria Navarro b441cbe3ec Include all dist 2023-08-09 17:06:05 +03:00
Adria Navarro 4c7dfc978e Whitelist .npmignore from backend-core 2023-08-09 16:41:44 +03:00