Rory Powell
3a4040cdc3
Update pro ref
2023-06-16 10:22:43 +01:00
Rory Powell
5f716a62a4
Revert "Merge branch 'develop' into master"
...
This reverts commit 67fb9de7f4
, reversing
changes made to ebec885b0a
.
2023-06-16 10:13:43 +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
Martin McKeaveney
7c49dd716c
remove console log
2023-06-15 15:29:29 +01:00
Martin McKeaveney
dd8e54c5e1
update airgap script and enable support for offline mode
2023-06-15 15:20:14 +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
Martin McKeaveney
cd1675098f
removing need for external internet assets and self hosting our own fonts
2023-06-14 14:54:27 +01:00
Adria Navarro
9832da4067
Merge branch 'develop' into budi-7010-encrypt-app-exports
2023-06-14 14:40:10 +01:00
Adria Navarro
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
mike12345567
3f63a81c01
PR comments.
2023-06-14 14:34:12 +01:00
Adria Navarro
052ecbb59a
Merge branch 'budi-7010/export_controller_as_post' into budi-7010-encrypt-app-exports
2023-06-14 14:28:26 +01:00
Adria Navarro
222de80e01
Fix creating app without password
2023-06-14 14:26:28 +01:00
Adria Navarro
fe1a64964a
Fix and improve tests
2023-06-14 14:20:20 +01:00
Adria Navarro
dec35fcafd
Simplify notification
2023-06-14 13:48:37 +01:00
Adria Navarro
fbf9b69a6b
Simplify notification
2023-06-14 13:48:10 +01:00
Adria Navarro
25eaf0feee
Merge branch 'budi-7010-encrypt-app-exports' into budi-7010/frontend-encrypt-app-exports
2023-06-14 12:33:00 +01:00
Adria Navarro
4b065dda8b
Fix exports/imports
2023-06-14 12:32:26 +01:00
Adria Navarro
0e8c54af75
Renames
2023-06-14 12:31:03 +01:00
Adria Navarro
8b6cc9cd98
Fix imports
2023-06-14 12:30:55 +01:00
Adria Navarro
450ac715a2
Merge branch 'budi-7010/frontend-encrypt-app-exports' into budi-7010/frontend-encrypt-app-imports
2023-06-14 11:34:09 +01:00
Adria Navarro
2fe83a96f1
Fix frontend
2023-06-14 11:30:05 +01:00
Adria Navarro
d507eb487a
Remove export
2023-06-14 11:21:47 +01:00
Adria Navarro
9a5f67b7d8
Merge branch 'budi-7010/frontend-encrypt-app-exports' into budi-7010/frontend-encrypt-app-imports
2023-06-14 11:21:19 +01:00
Adria Navarro
8e87e3cfc2
Merge branch 'budi-7010-encrypt-app-exports' into budi-7010/frontend-encrypt-app-exports
2023-06-14 11:20:31 +01:00
Adria Navarro
a4f0b45d5e
Fix merge
2023-06-14 11:17:32 +01:00
Adria Navarro
a9bf6967dc
Merge branch 'budi-7010/export_controller_as_post' into budi-7010-encrypt-app-exports
2023-06-14 11:17:26 +01:00
Adria Navarro
a68dc7c965
Remove excludeRows and appName from the querystrings
2023-06-14 11:06:46 +01:00
Adria Navarro
bfd444dbaa
Change the download to be a post
2023-06-14 10:47:46 +01:00
mike12345567
68082eecf9
Fix for circular issue with primary display fields on SQL tables introduced in most recent update - if somehow the primary display field is set to a relationship field there was a chance of cyclic structure occurring which Koa could not convert to JSON.
2023-06-13 18:21:22 +01:00
Adria Navarro
3d01775b89
Handle errors
2023-06-13 17:08:33 +01:00
Adria Navarro
f3b461a62c
Handle password on creation
2023-06-13 16:50:56 +01:00
Adria Navarro
557e7ad209
Request password on import app
2023-06-13 16:48:59 +01:00
mike12345567
60d58034dd
Fixes #6346 - issue with date parsing, adding in some testing around it.
2023-06-13 16:11:22 +01:00
Andrew Kingston
cfe86194cd
Merge pull request #10844 from Budibase/cheeks-lab-day-preview
...
Preview apps inside builder
2023-06-13 15:15:29 +01:00
mike12345567
1bdf55e966
Some type updates and fixes for test case.
2023-06-13 14:45:33 +01:00
Adria Navarro
38cce94f2c
Fix type
2023-06-13 14:28:31 +01:00
Adria Navarro
5f3335c566
Fix validation order
2023-06-13 13:07:41 +01:00
Adria Navarro
d041ad621f
Add email validation
2023-06-13 12:51:42 +01:00
Adria Navarro
4b7af2e16a
Pass password
2023-06-13 12:45:57 +01:00
Adria Navarro
7cfb47c287
Validation observe
2023-06-13 12:42:30 +01:00
Adria Navarro
32dde23728
Add validation
2023-06-13 11:57:56 +01:00
Adria Navarro
e0664222fe
Fix initial validation
2023-06-13 11:36:28 +01:00
Adria Navarro
383c7c4b2c
Add password field
2023-06-13 11:21:54 +01:00
Adria Navarro
1baaab2875
Add steps
2023-06-13 11:15:32 +01:00
Adria Navarro
c1e09d0305
Close client on testconnection
2023-06-13 10:49:09 +01:00
Adria Navarro
3aaaad8792
Update mongodb
2023-06-13 10:48:42 +01:00
Adria Navarro
e6455d005b
Add encrypt option
2023-06-13 10:00:01 +01:00
mike12345567
bedc8e5cce
Fix for custom roles that have not been published causing users to be unable to access an app completely. They should instead be treated as public users as their role isn't valid.
2023-06-12 18:39:30 +01:00
Adria Navarro
57c5facc6e
Zip exports
2023-06-12 17:54:09 +01:00
Adria Navarro
81522d0784
Clean defaults
2023-06-12 17:51:21 +01:00
Adria Navarro
70798a6b93
Clean
2023-06-12 17:50:07 +01:00
Adria Navarro
ded738a566
Clean code
2023-06-12 17:49:12 +01:00
Adria Navarro
92a8c97aba
Close streams
2023-06-12 17:34:12 +01:00
Adria Navarro
2971dfba9d
Renames
2023-06-12 17:31:08 +01:00
Adria Navarro
551ca404b4
Decrypt file
2023-06-12 16:27:19 +01:00
mike12345567
2486937c43
Merge branch 'develop' of github.com:Budibase/budibase into feature/table-fetching-frontend
2023-06-12 16:16:12 +01:00
mike12345567
fb0e4c2c40
Removing await.
2023-06-12 16:06:08 +01:00
Andrew Kingston
c2e5427860
Small refactor to move CSS variables inside fields rather fancy forms
2023-06-12 15:54:08 +01:00
melohagan
ab1a3eba81
Do not show Business tag for Email action ( #10867 )
2023-06-12 11:49:46 +01:00
Adria Navarro
1f4cdf348f
Encrypt files
2023-06-12 11:49:38 +01:00
Adria Navarro
d7f64fe6a4
Update tar libs
2023-06-12 11:12:22 +01:00
Dean
7564bcac4b
Merge remote-tracking branch 'origin/master' into fix/bindings-fixes
2023-06-12 10:44:38 +01:00
Dean
eef0d68791
Merge remote-tracking branch 'origin/master' into fix/component-focus-removed
2023-06-12 10:22:59 +01:00
Dean
c910ddcc81
Merge remote-tracking branch 'origin/master' into fix/bindings-fixes
2023-06-12 09:03:37 +01:00
Dean
b48083860d
Removed commented out code
2023-06-09 18:09:21 +01:00
Dean
2b21b7f4c9
Linting
2023-06-09 17:57:03 +01:00
Dean
c73315cc44
Temporarily remove the focus store update as it triggers a full redraw of the component settings
2023-06-09 17:42:41 +01:00
Adria Navarro
978591e2ba
Enable encrypting
2023-06-09 16:26:48 +01:00
Adria Navarro
4acfc623b4
Use import for tar
2023-06-09 14:52:19 +01:00
Michael Drury
06eb965564
Updates from PR comments.
2023-06-09 14:35:46 +01:00