Commit Graph

18749 Commits

Author SHA1 Message Date
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
Adria Navarro fe9a220717 Add yarn.lock 2023-06-06 14:45:20 +01:00
Adria Navarro 12b69dc37d Remove --configuration=production 2023-06-06 14:45:20 +01:00
Rory Powell ad7f6cf5e2 Merge branch 'develop' into merge-master 2023-06-06 11:49:49 +01:00
Rory Powell 49be2e5b3d Merge branch 'master' into develop 2023-06-06 11:33:23 +01:00
Adria Navarro 4247b4425c Clean code 2023-06-06 11:29:50 +01:00
Adria Navarro 21e870109c Save datasource 2023-06-06 11:29:50 +01:00
Adria Navarro 25c921e340 Validate url 2023-06-06 11:29:49 +01:00
Adria Navarro 1e238ce693 Validate google sheets url 2023-06-06 11:29:49 +01:00
Adria Navarro d4ba73f331 Open continue 2023-06-06 11:29:49 +01:00
Adria Navarro 3a6a3eb8a5 Store tokens in cache and amend redirect 2023-06-06 11:29:49 +01:00
Adria Navarro c89708cda3 Google wizard on the same page 2023-06-06 11:29:49 +01:00
Adria Navarro 498eedaf19 Remove confirm button while setting up google datasource 2023-06-06 11:29:49 +01:00
Andrew Kingston d70e49d74f Add event for tracking user collaboration 2023-06-06 10:11:51 +01:00
Adria Navarro 6dce5e85cd Merge pull request #10751 from Budibase/chore/split_auth_components
Chore - split google auth components
2023-06-06 11:10:54 +02:00
Rory Powell 4ed5c50c2b Update pro to develop 2023-06-05 23:22:07 +01:00
Rory Powell abbd8c5c8b Merge branch 'master' into develop 2023-06-05 23:19:43 +01:00
Adria Navarro ee81fd7a59 Split auth google section 2023-06-05 18:26:11 +01:00
Martin McKeaveney c53b7b0a44 Merge pull request #10789 from Budibase/collaboration-lock-transfer
Transfer lock to next oldest session when disconnecting from the builder
2023-06-05 17:47:40 +01:00
Dean 0a7669ad2d PR feedback 2023-06-05 16:26:27 +01:00
Dean f20653d4ca Branding fixes 2023-06-05 15:20:04 +01:00
Dean 42e3ca1872 Merge remote-tracking branch 'origin/develop' into fix/logo-urls 2023-06-05 14:14:02 +01:00
Rory Powell e00eb171be WIP logo url fixes 2023-06-05 14:01:46 +01:00
Andrew Kingston 3979c108e0 Add more optional chaining 2023-06-05 13:56:54 +01:00
Andrew Kingston 4a0e23a171 Transfer lock to next oldest session when disconnecting from the builder 2023-06-05 13:54:17 +01:00
Andrew Kingston 6de83a6ab4 Lint 2023-06-05 11:57:36 +01:00
Andrew Kingston f7e21c3348 Remove log from websocket heartbeat 2023-06-05 11:55:45 +01:00
Andrew Kingston 29968df6d9 Fix not being able to navigate away from the design section 2023-06-05 11:55:18 +01:00
Andrew Kingston d87e943750 Fix user avatar in audit logs page 2023-06-05 11:13:24 +01:00
mike12345567 0506096e72 Fixing filtering plus pagination in googlesheets, the pagination previously was first which broke the filtering. 2023-06-05 10:03:47 +01:00
mike12345567 770f7c1dc6 Merge branch 'develop' of github.com:Budibase/budibase into fix/google-sheets-issues 2023-06-05 09:36:45 +01:00
Andrew Kingston d4e28518d2 Fix error on SCIM page 2023-06-05 08:55:16 +01:00
Andrew Kingston ffde512307 Update position of floating buttons to be consistent 2023-06-05 08:49:35 +01:00
Andrew Kingston 920fea7b1f Remove beta button from grid, add feedback button to data section linking to collaboration maze 2023-06-05 08:48:02 +01:00
Andrew Kingston 4f176b3edd Increase padding around the grid 2023-06-05 08:30:53 +01:00
Andrew Kingston f7f9a359b2 Ensure edit button in overview is never disabled as we don't use the lock any more 2023-06-05 08:27:14 +01:00
mike12345567 e7649374d2 Fixing googlesheets filtering by _id - there was an issue with the response API giving _rowNumber rather than the expected primary key of rowNumber, need to update the filters accordingly. 2023-06-02 18:25:35 +01:00
mike12345567 213315e14f Fixing issue with row deletion not returning the _id of the row which was deleted in googlesheets. 2023-06-02 18:03:43 +01:00
Andrew Kingston 680b70643c Merge pull request #10775 from Budibase/collaboration-fixes
Collaboration fixes
2023-06-02 18:03:11 +01:00
Andrew Kingston 6f51843875 Fix TS issue 2023-06-02 16:22:07 +01:00
Andrew Kingston 0582dd40b2 Ensue table schema change made via grids are properly synced with backend stores, given absence of websocket events for own events 2023-06-02 15:28:48 +01:00
Andrew Kingston 2db3012ae0 Fix JSON editor overflow row edit modal 2023-06-02 15:13:57 +01:00
mike12345567 c13530ef32 Stop attempt at bundling ioredis-mock, only need to check at runtime. 2023-06-02 13:59:33 +01:00
deanhannigan 76cfb9d58e Merge pull request #10759 from Budibase/bindings-fixes
Fixes for Bindings V2
2023-06-02 13:16:16 +01:00
Dean 247896bdf3 Linting 2023-06-02 12:55:16 +01:00
Dean 9f2df319a2 Updated the JS Scripting modal use the new editor 2023-06-02 12:50:22 +01:00
Dean 450be6ec28 Changed the binding font to monospace per feedback 2023-06-02 12:03:25 +01:00
mike12345567 ddeb25b68d Updating mock redis to only import if it is needed. 2023-06-02 11:52:50 +01:00
Dean a8836a1531 Removed the monospace font from the Text editor and replaced it with the core font. 2023-06-02 11:46:01 +01:00
Dean 44dd09dfef UI colours updated 2023-06-02 10:56:36 +01:00