370d7314b0
Merge remote-tracking branch 'origin/develop' into feature/app-settings-section
2023-06-16 09:05:33 +01:00
58c26d563e
Fixing where getCachedLicense is retrieved from.
2023-06-15 23:29:34 +01:00
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
d84051ccfd
Merge branch 'master' of github.com:Budibase/budibase into develop
2023-06-15 17:08:08 +01:00
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
3843b98cf8
Merge remote-tracking branch 'origin/develop' into feature/app-settings-section
2023-06-15 12:51:25 +01:00
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
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
c876568865
Merge remote-tracking branch 'origin/develop' into feature/app-settings-section
2023-06-15 12:02:29 +01:00
b7f0387577
Merge branch 'develop' into budi-5262/support_pg_client_cert
2023-06-15 11:13:52 +01:00
4d3ab040bf
Support postgres client certificates
2023-06-15 11:06:01 +01:00
c2f8d54a8a
Merge remote-tracking branch 'origin/develop' into feature/app-settings-section
2023-06-15 10:59:28 +01:00
08ea400312
Merge commit
2023-06-15 10:59:24 +01:00
e8f28113da
Merge commit
2023-06-15 10:56:46 +01:00
37e27a881b
Merge branch 'develop' into backmerge-master
2023-06-15 10:18:34 +01:00
f446bd96dd
Merge branch 'master' into backmerge-master
2023-06-15 10:16:21 +01:00
7e3b6fd07b
Prevent premature closure of imported users modal. ( #10916 )
2023-06-15 09:41:17 +01:00
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
08894e91d6
fix for fonts in production
2023-06-14 18:48:44 +01:00
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
e6ad3a4719
Type pg
2023-06-14 17:17:29 +01:00
bfc6bb6a6e
Add spinner while saving datasources
2023-06-14 17:07:47 +01:00
dd9eec98ed
Update pro.
2023-06-14 17:01:40 +01:00
b22bae9a4e
update worker pro dep
2023-06-14 16:58:58 +01:00
fa835e65ef
Add loading when saving datasource
2023-06-14 16:57:36 +01:00
743108b170
using black bb logo instead of gray
2023-06-14 16:55:46 +01:00
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
f31c615e18
Merge branch 'develop' into backmerge-master
2023-06-14 15:45:47 +01:00
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
1ad150827a
fix deps
2023-06-14 15:35:16 +01:00
307e6dde02
update bblogoimgur to bblogo
2023-06-14 15:21:46 +01:00
0f02b31ba7
lint
2023-06-14 15:12:39 +01:00
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
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
6fcdcf947e
update budibaseapp url
2023-06-14 15:05:08 +01:00
129489e985
Update pro ref
2023-06-14 15:00:14 +01:00
7908914662
Update pro ref
2023-06-14 14:55:06 +01:00
cd1675098f
removing need for external internet assets and self hosting our own fonts
2023-06-14 14:54:27 +01:00
9832da4067
Merge branch 'develop' into budi-7010-encrypt-app-exports
2023-06-14 14:40:10 +01:00
672804c150
Merge pull request #10900 from Budibase/budi-7010/export_controller_as_post
...
BUDI-7010 - Export controller as post
2023-06-14 14:38:01 +01:00
3f63a81c01
PR comments.
2023-06-14 14:34:12 +01:00
052ecbb59a
Merge branch 'budi-7010/export_controller_as_post' into budi-7010-encrypt-app-exports
2023-06-14 14:28:26 +01:00
fe1a64964a
Fix and improve tests
2023-06-14 14:20:20 +01:00
dec35fcafd
Simplify notification
2023-06-14 13:48:37 +01:00
fbf9b69a6b
Simplify notification
2023-06-14 13:48:10 +01:00
25eaf0feee
Merge branch 'budi-7010-encrypt-app-exports' into budi-7010/frontend-encrypt-app-exports
2023-06-14 12:33:00 +01:00
4b065dda8b
Fix exports/imports
2023-06-14 12:32:26 +01:00
2fe83a96f1
Fix frontend
2023-06-14 11:30:05 +01:00
d507eb487a
Remove export
2023-06-14 11:21:47 +01:00
8e87e3cfc2
Merge branch 'budi-7010-encrypt-app-exports' into budi-7010/frontend-encrypt-app-exports
2023-06-14 11:20:31 +01:00
Dean
Michael Drury
Adria Navarro
Conor Webb
Martin McKeaveney
Martin McKeaveney
Jonny McCullagh