Michael Drury
b8c1a054f8
Merge branch 'master' into fix/12070-user-column-dnd-freeze
2023-10-17 11:03:30 +01:00
Adria Navarro
beb3136312
Fix sentry import
2023-10-17 10:59:46 +02:00
mike12345567
fefd5fa0dc
Quick fix for drag and drop behaviour of relationship cells, appears empty cells were causing things to break in the re-render.
2023-10-16 17:41:20 +01:00
Adria Navarro
8e64fb9858
Merge branch 'master' into BUDI-7573/use_existing_image_cache
2023-10-16 16:46:14 +02:00
Michael Drury
b86bcb7f4b
Merge branch 'master' into fix/12046-nav-links-overwrite-app
2023-10-16 15:30:25 +01:00
Adria Navarro
26618794ae
Merge branch 'master' into BUDI-7573/use_existing_image_cache
2023-10-16 16:17:26 +02:00
Martin McKeaveney
8c0ed39652
submodule
2023-10-16 14:53:57 +01:00
Martin McKeaveney
2ef9871fda
merge with master
2023-10-16 14:42:50 +01:00
Adria Navarro
dc4fc27fc8
Merge branch 'master' into BUDI-7573/use_existing_image_cache
2023-10-16 10:38:09 +02:00
mike12345567
cef71ff708
Adding test cases for navbar update.
2023-10-13 18:03:10 +01:00
mike12345567
6a4877159d
Quick fix to make sure that the important components of the app metadata are correctly updated - as well as adjusting the import modal to check if the export is encrypted.
2023-10-13 17:43:14 +01:00
Andrew Kingston
73ca87dfb6
Fix issue with sort setting
2023-10-13 17:04:45 +01:00
mike12345567
f64800f9f4
Final PR comment.
2023-10-13 13:05:07 +01:00
mike12345567
c5360e1dcb
Don't need to put into options obj, reaction does work.
2023-10-13 12:53:18 +01:00
mike12345567
03371005c1
PR comments - addressing API.searchUser updates.
2023-10-13 12:23:28 +01:00
mike12345567
ccfc98120d
Adding check to not re-fetch default value.
2023-10-13 11:44:15 +01:00
mike12345567
d44ad549ef
t status
...
Merge branch 'fix/user-search-api' of github.com:Budibase/budibase into fix/user-search-api
2023-10-13 11:34:55 +01:00
mike12345567
563baa53c3
Fix var usage.
2023-10-13 11:28:23 +01:00
Michael Drury
ec213a3c7a
Merge branch 'master' into fix/user-search-api
2023-10-13 10:41:08 +01:00
mike12345567
d3366a535b
PR comments.
2023-10-13 10:22:29 +01:00
Sam Rose
18363b7b60
Make sure to stop postgres container after the postgres integration tests have run.
2023-10-13 09:50:45 +01:00
Adria Navarro
5ef90a3855
Fix import
2023-10-13 09:08:07 +02:00
mike12345567
2e8e21e5d2
Linting.
2023-10-12 19:20:03 +01:00
mike12345567
bd182d5b3b
Test cases for updated API.
2023-10-12 19:19:05 +01:00
mike12345567
162f2cb938
Removing un-used function.
2023-10-12 19:07:22 +01:00
mike12345567
535a6e1a47
Minor cleanup.
2023-10-12 19:07:04 +01:00
mike12345567
16d551542e
Frontend component of updating the API and accounting for default value not being in the paginated results of the relationship picker.
2023-10-12 19:00:53 +01:00
mike12345567
6bbce23910
Updating user fetch functionality to send up lucene syntax for searching to global user endpoint.
2023-10-12 16:31:32 +01:00
mike12345567
44fbda9290
Fixing conflict.
2023-10-12 11:18:03 +01:00
mike12345567
7b8e23eb82
Merge branch 'master' of github.com:Budibase/budibase into BUDI-7573/use_existing_image_cache
2023-10-12 11:08:12 +01:00
Andrew Kingston
052ec2a7ed
Merge branch 'master' into fix/selected-by-user-obscured-nav-item
2023-10-12 08:34:21 +01:00
Conor Webb
d6f8662e95
Adding onchange actions to code scanner. ( #12029 )
...
* Adding onchange actions to code scanner.
* Removed unused code, set updateOnChange to false.
---------
Co-authored-by: Michael Drury <me@michaeldrury.co.uk>
2023-10-12 08:29:40 +01:00
Andrew Kingston
98cb8afdd4
Merge branch 'master' into fix/selected-by-user-obscured-nav-item
2023-10-12 08:28:32 +01:00
mike12345567
b6d56351b0
Merge branch 'backmerge-20231011' of github.com:Budibase/budibase into backmerge-20231011
2023-10-11 18:50:22 +01:00
mike12345567
f1b73058c2
Merge branch 'fix/update-vm2' of github.com:Budibase/budibase into backmerge-20231011
2023-10-11 18:49:39 +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
Adria Navarro
5908a791f2
Return email and names on bb reference api output
2023-10-11 19:10:58 +02: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
Michael Drury
95423fdabc
Merge branch 'master' into fix/create-duplicate-queries
2023-10-11 17:27:01 +01:00
mike12345567
b310d7c5a7
Linting.
2023-10-11 17:12:28 +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
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
Sam Rose
a0e9abb95b
Responding to PR feedback.
2023-10-11 16:45:02 +01: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