Adria Navarro
98c549ceaf
Fix ref
2023-06-20 13:42:39 +01:00
Adria Navarro
3535aa4894
Fix pro tests
2023-06-20 13:15:32 +01:00
Adria Navarro
c0f95b8929
Update pro ref
2023-06-20 11:45:37 +01:00
Adria Navarro
50d082c385
Merge branch 'develop' into chore/refactor_pro_as_package
2023-06-20 11:14:05 +01:00
mike12345567
e0c21864b8
Merge branch 'develop' of github.com:Budibase/budibase into fix/add-automation-step
2023-06-19 18:53:36 +01:00
Michael Drury
c5270ee323
Merge pull request #10959 from Budibase/fix/integration-tests
...
Integration test updates and improved logging
2023-06-19 18:52:24 +01:00
Adria Navarro
acfe69a3d5
Remove the doble deep format references
2023-06-19 18:34:51 +01:00
mike12345567
289a75fc9a
Few minor updates to the integration suite to make it easier to decipher what is happening under the hood, as well as making it easier to log from these (where there is no pino logging available, importing backend-core breaks things). Also added a new script which can be used to get local environment setup as needed to run qa-core tests. Finally, xdescribe for the failing test until can work out what is wrong with MongoDB installation in QA environment.
2023-06-19 18:28:38 +01:00
Adria Navarro
fe3b3aaf53
Fix dependencies
2023-06-19 17:55:47 +01:00
Adria Navarro
7bd0078210
Clean code
2023-06-19 17:55:47 +01:00
Adria Navarro
b0f40be409
Update bcrypt
2023-06-19 17:55:47 +01:00
Adria Navarro
d7d1eabc0f
Fix build order
2023-06-19 17:55:47 +01:00
Adria Navarro
fe2d63f741
Fix lint
2023-06-19 17:33:10 +01:00
Peter Clement
832ee22c0a
fix issue with adding automation step
2023-06-19 11:43:00 +01:00
Adria Navarro
a0bfebf53d
Merge pull request #10894 from Budibase/budi-7010/frontend-encrypt-app-imports
...
BUDI-7010 - Frontend decrypt app imports
2023-06-19 11:18:38 +01:00
Andrew Kingston
07c79ec592
Fix fonts not loading in builder preview in dev
2023-06-16 14:46:34 +01:00
Andrew Kingston
224ff4dcbf
Merge pull request #10929 from Budibase/fix/font-paths
...
Fix font paths so they work in both dev and prod
2023-06-16 12:07:09 +01:00
Andrew Kingston
67ef740532
Fix font paths so they work in both dev and prod
2023-06-16 10:34:34 +01:00
Adria Navarro
aafb294749
Fix linting issues
2023-06-16 10:08:31 +01:00
Michael Drury
58c26d563e
Fixing where getCachedLicense is retrieved from.
2023-06-15 23:29:34 +01:00
Michael Drury
a1d8ad047a
Quick fix suggested by Rory to make use of the cached license when fetching the app package.
2023-06-15 22:51:33 +01:00
mike12345567
d84051ccfd
Merge branch 'master' of github.com:Budibase/budibase into develop
2023-06-15 17:08:08 +01:00
mike12345567
67e2ce86ce
Adding a license mechanism to the app package call so that public apps can still return what license the app utilises. This is retrieved based on the tenant of the app - we only attach the license type so as to not expose further information than is necessary.
2023-06-15 16:33:07 +01:00
Adria Navarro
2e2b200b45
Merge pull request #10883 from Budibase/budi-7010/frontend-encrypt-app-exports
...
BUDI-7010 - Frontend encrypt app exports
2023-06-15 12:40:32 +01:00
Adria Navarro
df3afe2a7c
Merge pull request #10918 from Budibase/budi-5262/support_pg_client_cert
...
Budi 5262 - Support pg client cert
2023-06-15 12:40:16 +01:00
Adria Navarro
b7f0387577
Merge branch 'develop' into budi-5262/support_pg_client_cert
2023-06-15 11:13:52 +01:00
Adria Navarro
4d3ab040bf
Support postgres client certificates
2023-06-15 11:06:01 +01:00
Adria Navarro
37e27a881b
Merge branch 'develop' into backmerge-master
2023-06-15 10:18:34 +01:00
Adria Navarro
f446bd96dd
Merge branch 'master' into backmerge-master
2023-06-15 10:16:21 +01:00
Conor Webb
7e3b6fd07b
Prevent premature closure of imported users modal. ( #10916 )
2023-06-15 09:41:17 +01:00
Michael Drury
202d8d4fb5
Merge pull request #10910 from Budibase/update-pro-14-jun
...
Updating pro to xit an inconsistent test
2023-06-15 09:22:26 +01:00
Martin McKeaveney
08894e91d6
fix for fonts in production
2023-06-14 18:48:44 +01:00
Martin McKeaveney
0545eda29d
Merge pull request #10905 from Budibase/feature/airgap-assets-support
...
removing need for external internet assets and self hosting our own f…
2023-06-14 17:37:43 +01:00
Adria Navarro
e6ad3a4719
Type pg
2023-06-14 17:17:29 +01:00
Adria Navarro
bfc6bb6a6e
Add spinner while saving datasources
2023-06-14 17:07:47 +01:00
mike12345567
dd9eec98ed
Update pro.
2023-06-14 17:01:40 +01:00
Martin McKeaveney
b22bae9a4e
update worker pro dep
2023-06-14 16:58:58 +01:00
Adria Navarro
fa835e65ef
Add loading when saving datasource
2023-06-14 16:57:36 +01:00
Martin McKeaveney
743108b170
using black bb logo instead of gray
2023-06-14 16:55:46 +01:00
Jonny McCullagh
757ca6a166
Merge master develop ( #10897 )
...
* Binding drawer fixes
* Added missing headless flag for the bindable combobox
* Fix for QueryEditor width
* Fix svelte transitions in grid new row component breaking routify
* Bump version to 2.7.7
* fix REST connector failure to save
* Bump version to 2.7.8
* Bump version to 2.7.9
* Unexpected token when export data (#10721 )
* Tidy ID string for JSON parse
* Display error for composite keys
* Unit test WIP
* directly assign the mock function on the datasource
* Unit tests for exportRows ID handling
---------
Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>
* Return all rows if oneOf value is falsey (#10638 )
* Bump version to 2.7.10
* Make sure divider fields are left-most (#10627 )
* Make sure divider fields are left most
* Refactor
* Bump version to 2.7.11
* Temporarily remove the focus store update as it triggers a full redraw of the component settings
* Linting
* Removed commented out code
* Bump version to 2.7.12
* Bump version to 2.7.13
* Do not show Business tag for Email action (#10867 )
* Bump version to 2.7.14
* new deploy trigger (#10892 )
* point the deploys at the new env
* Bump version to 2.7.15
---------
Co-authored-by: Dean <deanhannigan@gmail.com>
Co-authored-by: Andrew Kingston <andrew@kingston.dev>
Co-authored-by: Budibase Staging Release Bot <>
Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>
Co-authored-by: Martin McKeaveney <martin@budibase.com>
Co-authored-by: melohagan <101575380+melohagan@users.noreply.github.com>
Co-authored-by: Adria Navarro <adria@budibase.com>
2023-06-14 16:18:09 +01:00
Adria Navarro
f31c615e18
Merge branch 'develop' into backmerge-master
2023-06-14 15:45:47 +01:00
Adria Navarro
ba93aa91bb
Merge pull request #10904 from Budibase/hotfix/budi-7116-importing-custom-datasource-plugin-error
...
Hotfix - fix custom plugin import
2023-06-14 15:44:17 +01:00
Martin McKeaveney
1ad150827a
fix deps
2023-06-14 15:35:16 +01:00
Martin McKeaveney
307e6dde02
update bblogoimgur to bblogo
2023-06-14 15:21:46 +01:00
Martin McKeaveney
0f02b31ba7
lint
2023-06-14 15:12:39 +01:00
Michael Drury
6776f3d78c
Merge pull request #10881 from Budibase/fix/budi-7026
...
Custom roles breaking app access when not published
2023-06-14 15:10:30 +01:00
Michael Drury
fdad2e6bf3
Merge pull request #10895 from Budibase/fix/budi-7099
...
MySQL cyclic JSON conversion issue with primary display columns
2023-06-14 15:09:17 +01:00
Martin McKeaveney
6fcdcf947e
update budibaseapp url
2023-06-14 15:05:08 +01:00
Adria Navarro
129489e985
Update pro ref
2023-06-14 15:00:14 +01:00
Adria Navarro
7908914662
Update pro ref
2023-06-14 14:55:06 +01:00