Commit Graph

18763 Commits

Author SHA1 Message Date
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
mike12345567 532583e66e Fixing develop currentapp.spec.js test case, when packages within backend-core import all of backend-core they can create cyclics that cause issues. 2023-06-08 13:47:16 +01:00
mike12345567 e07dfab98c Merge branch 'master' of github.com:Budibase/budibase into develop 2023-06-07 18:05:29 +01:00
mike12345567 b2a21addc3 Updating release workflows to use a script instead of repeating and adding scripts for updating and resetting dependencies if attempting to build packages locally. 2023-06-07 17:18:59 +01:00
mike12345567 06a7a31847 Hardcoding the top level path for the app service as well. 2023-06-07 16:39:33 +01:00
mike12345567 8d7119a363 Make sure top level path is resolved correctly. 2023-06-07 16:37:42 +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 d21274ef2b Remove frozen-lockfile from dockerfiles 2023-06-07 09:05:34 +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
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
Adria Navarro 1f428bd5c2 Fix test 2023-06-06 12:17:56 +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