Commit Graph

22414 Commits

Author SHA1 Message Date
Rory Powell 6c5aebdbf0 Merge branch 'develop' into backmerge-master 2023-06-16 11:37:07 +01:00
Rory Powell 887b980b11 Revert "Merge pull request #10927 from Budibase/revert-merge-develop-1"
This reverts commit 548b3037e5, reversing
changes made to 179f06f106.
2023-06-16 11:34:02 +01:00
Andrew Kingston a2d2b333a5 Remove checkbox transitions in grids to avoid flashing while scrolling 2023-06-16 10:53:29 +01:00
Budibase Staging Release Bot 698bbad989 Bump version to 2.7.24 2023-06-16 09:35:00 +00:00
Andrew Kingston 67ef740532 Fix font paths so they work in both dev and prod 2023-06-16 10:34:34 +01:00
Budibase Staging Release Bot 8029e7eb79 Bump version to 2.7.21-alpha.3 2023-06-16 09:29:29 +00:00
Rory Powell 045060c563 Merge pull request #10928 from Budibase/update-pro-ref
Update pro ref
2023-06-16 10:28:35 +01:00
Budibase Staging Release Bot 77a83d3c13 Bump version to 2.7.23 2023-06-16 09:24:15 +00:00
Rory Powell 3a4040cdc3 Update pro ref 2023-06-16 10:22:43 +01:00
Adria Navarro 98456fe418 Merge pull request #10926 from Budibase/fix_linting
Fix linting issues
2023-06-16 10:18:22 +01:00
Andrew Kingston ffd4148655 Prevent hovering over rows when dragging and keep scroll bar in the selected state 2023-06-16 10:17:10 +01:00
Rory Powell 548b3037e5 Merge pull request #10927 from Budibase/revert-merge-develop-1
Revert "Merge branch 'develop' into master"
2023-06-16 10:16:11 +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
Budibase Staging Release Bot 179f06f106 Bump version to 2.7.22 2023-06-16 09:10:34 +00:00
Adria Navarro aafb294749 Fix linting issues 2023-06-16 10:08:31 +01:00
Rory Powell 67fb9de7f4 Merge branch 'develop' into master 2023-06-16 10:06:15 +01:00
Andrew Kingston 70eda7ff81 Merge branch 'develop' of github.com:Budibase/budibase into grid-block 2023-06-16 10:02:42 +01:00
Dean 370d7314b0 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-16 09:05:33 +01:00
Budibase Staging Release Bot ebec885b0a Bump version to 2.7.21 2023-06-15 23:12:57 +00:00
Michael Drury 71f90edbae Merge pull request #10923 from Budibase/fix/cached-license-app-package
Quick fix to app package licensing fetch
2023-06-16 00:09:34 +01:00
Budibase Staging Release Bot 86a291d371 Bump version to 2.7.21-alpha.2 2023-06-15 22:33:29 +00:00
Michael Drury 58c26d563e Fixing where getCachedLicense is retrieved from. 2023-06-15 23:29:34 +01:00
Michael Drury f80b900338 Fixing where getCachedLicense is retrieved from. 2023-06-15 23:29:08 +01:00
Budibase Staging Release Bot ec04575d45 Bump version to 2.7.21-alpha.1 2023-06-15 21:55:50 +00: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
Michael Drury 22814db9d3 Quick fix suggested by Rory to make use of the cached license when fetching the app package. 2023-06-15 22:49:46 +01:00
Budibase Staging Release Bot 6e6acf64ab Bump version to 2.7.21-alpha.0 2023-06-15 16:12:29 +00:00
mike12345567 d84051ccfd Merge branch 'master' of github.com:Budibase/budibase into develop 2023-06-15 17:08:08 +01:00
Budibase Staging Release Bot a1c9aaf760 Bump version to 2.7.20 2023-06-15 15:53:18 +00:00
Michael Drury 85afe3f1cb Merge pull request #10922 from Budibase/fix/budi-7069
Fix public apps still displaying free footer when licensed
2023-06-15 16:48:59 +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
Andrew Kingston 86265a90e0 Only respect keyboard events in grids when the mouse is over them 2023-06-15 15:25:05 +01:00
Martin McKeaveney dd8e54c5e1 update airgap script and enable support for offline mode 2023-06-15 15:20:14 +01:00
Dean e1f6b3dcaf Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-15 14:40:16 +01:00
Andrew Kingston 73cae6198f Improve grid logic around vertically inverting row popovers 2023-06-15 14:23:33 +01:00
Budibase Staging Release Bot 9ca264642e Bump version to 2.7.20-alpha.2 2023-06-15 12:47:33 +00:00
Adria Navarro 74847337d6 Merge pull request #10919 from Budibase/budi-7048-update-to-lerna-7
BUDI-7048 - Update to lerna 7
2023-06-15 13:43:38 +01:00
Dean 3843b98cf8 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-15 12:51:25 +01:00
Budibase Staging Release Bot 3be274c756 Bump version to 2.7.20-alpha.1 2023-06-15 11:47:45 +00: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 2f1274c88e Remove useWorkspaces (breaking change) 2023-06-15 12:37:57 +01:00
Dean c876568865 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-15 12:02:29 +01:00
Budibase Staging Release Bot ea30b4a176 Bump version to 2.7.20-alpha.0 2023-06-15 10:57:03 +00:00
Michael Drury 407ec2cdb4 Merge pull request #10907 from Budibase/backmerge-master
Backmerge master 2023-06-15
2023-06-15 11:52:45 +01:00
Adria Navarro bc82f95410 Update nx to latest 2023-06-15 11:48:49 +01:00
Adria Navarro 7f9891b5a7 Update lerna out of beta 2023-06-15 11:48:12 +01:00
Andrew Kingston 6a42d76c62 Add border radius to grid block 2023-06-15 11:19:46 +01:00
Adria Navarro b7f0387577 Merge branch 'develop' into budi-5262/support_pg_client_cert 2023-06-15 11:13:52 +01:00