mike12345567
3d3efadb37
Merge branch 'master' of github.com:Budibase/budibase into develop
2023-06-23 15:19:49 +01:00
Andrew Kingston
007b6d605b
Merge pull request #10917 from Budibase/fix/datasource-409
...
Fix datasource conflicts
2023-06-23 11:54:15 +01:00
mike12345567
58d7293798
PR suggestion.
2023-06-22 13:25:37 +01:00
mike12345567
5373b867e1
Fix for #10949 - the relationship types were always locked to be the same, which means that the foreign key wasn't being updated correctly as the backend was not aware of which side was the one-to-many side.
2023-06-22 12:32:39 +01:00
Adria Navarro
8ab5913eb9
Change url
2023-06-20 11:33:38 +01:00
Adria Navarro
6ed5894441
Type
2023-06-20 11:14:23 +01:00
Adria Navarro
7a4eb3113d
Add external schema endpoint
2023-06-19 17:56:11 +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
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
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
f446bd96dd
Merge branch 'master' into backmerge-master
2023-06-15 10:16:21 +01:00
Andrew Kingston
99a8fc7c12
Revert websocket changes and just fetch datasources constantly
2023-06-15 09:27:45 +01:00
Andrew Kingston
5e5dc902d1
Broadcast datasource change via websocket when making changes to tables
2023-06-15 09:04: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
f31c615e18
Merge branch 'develop' into backmerge-master
2023-06-14 15:45:47 +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
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
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
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
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
f3b461a62c
Handle password on creation
2023-06-13 16:50:56 +01:00
mike12345567
1bdf55e966
Some type updates and fixes for test case.
2023-06-13 14:45:33 +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
Adria Navarro
1f4cdf348f
Encrypt files
2023-06-12 11:49:38 +01:00
Adria Navarro
978591e2ba
Enable encrypting
2023-06-09 16:26:48 +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
mike12345567
dd8f7fdb91
Merge branch 'develop' of github.com:Budibase/budibase into feature/table-fetching-frontend
2023-06-07 18:06:27 +01:00
mike12345567
e07dfab98c
Merge branch 'master' of github.com:Budibase/budibase into develop
2023-06-07 18:05:29 +01:00
mike12345567
9ebd90a07d
Don't resolve anymore given we have an absolute top level path
2023-06-07 16:36:43 +01:00
mike12345567
70e4795349
Fix top level path within the single image to make sure it can find builder assets correctly.
2023-06-07 16:35:36 +01:00
Adria Navarro
4eac5f93ca
Fix test
2023-06-07 14:10:02 +01:00
Adria Navarro
d8fc37a760
Revert "Merge pull request #10808 from Budibase/undo_wrong_merge_from_develop"
...
This reverts commit 4ccc98103c
, reversing
changes made to 500424c651
.
2023-06-07 14:08:47 +01:00
Adria Navarro
fdd4492830
Merge branch 'develop' into master-backmerge
2023-06-07 14:07:16 +01:00
melohagan
91acb1b3eb
Set sourceId ( #10769 )
2023-06-07 14:01:24 +01:00
Adria Navarro
deeba8bae3
Revert "Merge branch 'develop' into master"
...
This reverts commit 6f29c978e0
, reversing
changes made to 1c6ff73c19
.
2023-06-06 22:06:34 +01:00
mike12345567
dab1db2271
Updating datasource save API to allow specifying a filter for which tables to fetch and then linking this up with the new frontend.
2023-06-06 18:27:03 +01:00
mike12345567
cc60baa3d1
Some fixes for BBUI and updating postgres table name fetching to get uniques.
2023-06-06 17:40:14 +01:00
Adria Navarro
1f428bd5c2
Fix test
2023-06-06 12:17:56 +01:00