1
0
Fork 0
mirror of synced 2024-09-03 19:21:11 +12:00
Commit graph

8842 commits

Author SHA1 Message Date
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
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
f446bd96dd Merge branch 'master' into backmerge-master 2023-06-15 10:16:21 +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
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
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
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
fe1a64964a Fix and improve tests 2023-06-14 14:20:20 +01:00
Adria Navarro
4b065dda8b Fix exports/imports 2023-06-14 12:32:26 +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
mike12345567
60d58034dd Fixes #6346 - issue with date parsing, adding in some testing around it. 2023-06-13 16:11:22 +01:00
mike12345567
1bdf55e966 Some type updates and fixes for test case. 2023-06-13 14:45:33 +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
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
81522d0784 Clean defaults 2023-06-12 17:51:21 +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
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
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
deffe9d3d4 Merge branch 'develop' of github.com:Budibase/budibase into feature/table-fetching-frontend 2023-06-09 13:21:30 +01:00
melohagan
24a00c66bb 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>
2023-06-09 13:01:55 +01:00
Adria Navarro
8492ef18fa Ignore 409 errors on user syncs 2023-06-09 12:36:09 +01:00
melohagan
c0578d4cc2 Send meeting invite via automation email smtp (#10787)
* Pass calendar props into sendSmtpEmail

* Add calendar event to message

* Add Checkbox and DatePicker automation field UI

* Add URL prop

* Add url to sendSmtpEmail unit test

* Refactor

* Code review comments

* Make location optional

* Add EmailInvite type

---------

Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
2023-06-08 14:25:35 +01:00
Martin McKeaveney
fa64ca3d6b lint 2023-06-08 12:44:41 +01:00
Martin McKeaveney
a9787ff608 fix REST connector failure to save 2023-06-08 12:00:34 +01:00
mike12345567
9ee06e8e42 Updating fetch within main datasource UI to mimic that of the onboarding. 2023-06-07 18:34:32 +01:00
mike12345567
dd8f7fdb91 Merge branch 'develop' of github.com:Budibase/budibase into feature/table-fetching-frontend 2023-06-07 18:06:27 +01:00