Commit Graph

25683 Commits

Author SHA1 Message Date
mike12345567 f1b73058c2 Merge branch 'fix/update-vm2' of github.com:Budibase/budibase into backmerge-20231011 2023-10-11 18:49:39 +01:00
mike12345567 f958832e86 Removing dupe vm2 2023-10-11 18:48:04 +01:00
mike12345567 7090819752 Updating version of VM2 to ^3.9.19 - due to possible RCE issue with Promises (we do not allow async code, but there still could be a risk). 2023-10-11 18:43:25 +01:00
Adria Navarro 4ae3d56023 Update pro ref 2023-10-11 19:42:58 +02:00
Adria Navarro 6869f892a8 Update pro ref 2023-10-11 19:41:31 +02:00
Adria Navarro 1089136a02 Merge branch 'develop' into backmerge-20231011 2023-10-11 19:28:01 +02:00
Budibase Staging Release Bot 1ce94484fd Bump version to 2.11.26 2023-10-11 17:27:27 +00:00
Adria Navarro 1eebe010f3 Merge pull request #12040 from Budibase/return_user_data_on_columns
Return user data on user API
2023-10-11 19:27:02 +02:00
Adria Navarro 5908a791f2 Return email and names on bb reference api output 2023-10-11 19:10:58 +02:00
Budibase Staging Release Bot 15c308efca Bump version to 2.11.25 2023-10-11 17:06:01 +00:00
Michael Drury e6d03d5971 Merge pull request #12039 from Budibase/fix/update-open-api-specs-oct-23
Updating OpenAPI specs
2023-10-11 18:05:43 +01:00
mike12345567 d1b7ccd86f Updating docs and removing old documentation pathway. 2023-10-11 17:49:25 +01:00
Martin McKeaveney 0040db27b2 Merge branch 'master' into fix/selected-by-user-obscured-nav-item 2023-10-11 17:32:40 +01:00
Budibase Staging Release Bot bda67b1aca Bump version to 2.11.24 2023-10-11 16:32:36 +00:00
Martin McKeaveney 4671d5fc4c Merge pull request #11896 from Budibase/fix/create-duplicate-queries
Fix for database query duplication
2023-10-11 17:32:13 +01:00
Michael Drury 95423fdabc Merge branch 'master' into fix/create-duplicate-queries 2023-10-11 17:27:01 +01:00
mike12345567 46869df59a Merge branch 'fix/internal-db-enrich-perf' of github.com:Budibase/budibase into fix/internal-db-enrich-perf 2023-10-11 17:24:34 +01:00
Budibase Staging Release Bot 6219299bb9 Bump version to 2.11.23 2023-10-11 16:24:11 +00:00
mike12345567 09ce950e64 Merge branch 'master' of github.com:Budibase/budibase into fix/internal-db-enrich-perf 2023-10-11 17:24:08 +01:00
Michael Drury 0e090ade2e Merge pull request #12034 from Budibase/fix/budi-7552-csv-import-messes-up-auto-generated-auto-id-column
Fix bulk import messing up auto ID columns
2023-10-11 17:23:14 +01:00
Michael Drury e5eb3c98f2 Merge branch 'develop' into grid-all-datasources 2023-10-11 17:21:54 +01:00
mike12345567 b310d7c5a7 Linting. 2023-10-11 17:12:28 +01:00
Michael Drury cffb78e93b Merge branch 'master' into fix/budi-7552-csv-import-messes-up-auto-generated-auto-id-column 2023-10-11 17:01:58 +01:00
Sam Rose c76e110350 Add BulkImportResponse as a type after merging Adri's type changes. 2023-10-11 16:58:24 +01:00
Sam Rose 789b247879 Pull origin, resolve merge conflicts. 2023-10-11 16:53:28 +01:00
Sam Rose 123f96db12 Pull origin, resolve merge conflicts. 2023-10-11 16:49:34 +01:00
Budibase Staging Release Bot ee5f9a3d00 Bump version to 2.11.22 2023-10-11 15:48:28 +00:00
Michael Drury 7825a56847 Merge branch 'master' into fix/budi-7552-csv-import-messes-up-auto-generated-auto-id-column 2023-10-11 16:48:19 +01:00
Adria Navarro 4fb163a0c4 Merge pull request #12000 from Budibase/feature/multi-user-type-column
User type column improvements
2023-10-11 17:48:01 +02:00
Sam Rose a0e9abb95b Responding to PR feedback. 2023-10-11 16:45:02 +01:00
Adria Navarro 40b2757de7 Merge branch 'master' into feature/multi-user-type-column 2023-10-11 17:44:15 +02:00
Michael Drury 6f4ddc1470 Merge branch 'master' into fix/budi-7552-csv-import-messes-up-auto-generated-auto-id-column 2023-10-11 16:42:20 +01:00
Budibase Staging Release Bot c143b3eca8 Bump version to 2.11.21 2023-10-11 15:42:03 +00:00
Michael Drury d212837b1b Merge branch 'master' into fix/budi-7552-csv-import-messes-up-auto-generated-auto-id-column 2023-10-11 16:42:01 +01:00
Martin McKeaveney c01fafef3a Delete .github/workflows/check_unreleased_changes.yml 2023-10-11 16:41:45 +01:00
Adria Navarro ea7e9abcf1 Merge branch 'master' into feature/multi-user-type-column 2023-10-11 17:38:23 +02:00
Budibase Staging Release Bot b2a19eeb82 Bump version to 2.11.20 2023-10-11 15:37:45 +00:00
Adria Navarro 87237ca918 Merge pull request #11987 from Budibase/labday/type_schema
Typing field schemas
2023-10-11 17:37:19 +02:00
Budibase Staging Release Bot 53c309fe39 Bump version to 2.11.20-alpha.0 2023-10-11 13:18:07 +00:00
Michael Drury a609b2b747 Merge pull request #12031 from Budibase/backmerge-20231011
Backmerge master 20231011
2023-10-11 14:17:47 +01:00
mike12345567 d14a773925 Merge branch 'develop' of github.com:Budibase/budibase into backmerge-20231011 2023-10-11 14:02:48 +01:00
Adria Navarro e6b807cf4a Fix merge conflicts 2023-10-11 14:14:55 +02:00
Adria Navarro 62fd9011f3 Merge branch 'labday/type_schema' into feature/multi-user-type-column 2023-10-11 14:13:55 +02:00
Adria Navarro 1bfde57391 Remove anys on tests 2023-10-11 14:08:22 +02:00
Adria Navarro c3bfc0d118 Merge branch 'master' into labday/type_schema 2023-10-11 14:00:11 +02:00
Adria Navarro 0720aa8b98 Remove any 2023-10-11 13:55:35 +02:00
Adria Navarro 8fa71e2e1b Clean 2023-10-11 13:54:51 +02:00
Adria Navarro fcaf657e53 More types 2023-10-11 13:53:14 +02:00
Sam Rose 0d9f257cc2 Remove whitespace-only change. 2023-10-11 12:51:57 +01:00
Adria Navarro 514f2b0cef Types 2023-10-11 13:48:28 +02:00