1
0
Fork 0
mirror of synced 2024-07-08 07:46:10 +12:00
Commit graph

7068 commits

Author SHA1 Message Date
Andrew Kingston 7ba8bc6a19 Rewrite client form library to derive state where possible and handle steps 2021-08-19 12:53:31 +01:00
Andrew Kingston 9ea255b7bc Update validate form action to be able to only validate the current form step 2021-08-19 12:52:50 +01:00
Andrew Kingston 2f05450d79 Ensure client preview indicator doesn't crash when encountering incorrect node types 2021-08-19 12:52:13 +01:00
Budibase Staging Release Bot 7bc05aa4e4 v0.9.105-alpha.24 2021-08-19 07:08:13 +00:00
Martin McKeaveney 1a588f0973 Merge pull request #2400 from Budibase/feature/budibase-kubernetes
Budibase Kubernetes Support
2021-08-19 07:54:55 +01:00
Andrew Kingston 9b87d1a03e Add button actions for navigating form steps 2021-08-18 15:21:18 +01:00
Andrew Kingston 32fe0ea072 Support multiple component context exports and export additional context from forms 2021-08-18 14:58:58 +01:00
Andrew Kingston fa275b2c4b Add initial form step component 2021-08-18 14:58:35 +01:00
Budibase Staging Release Bot 741794bcad v0.9.105-alpha.23 2021-08-18 13:19:18 +00:00
PClmnt 24caf164cd Merge pull request #2403 from Budibase/pc-bug-fixes
Misc Bug Fixes
2021-08-18 14:09:24 +01:00
Budibase Staging Release Bot 8f82f13e1b v0.9.105-alpha.22 2021-08-18 12:11:42 +00:00
Martin McKeaveney 841dd7de6f Merge pull request #2405 from Budibase/simplify-couch-config
simplify couchDB configuration
2021-08-18 13:01:48 +01:00
Martin McKeaveney 2a766a3011 catch when no couchDB url passed 2021-08-18 11:55:19 +01:00
Andrew Kingston c945fc650d Add stepper component to bbui for numeric values 2021-08-18 11:32:39 +01:00
Martin McKeaveney af4c1b23de simplify couchDB configuration 2021-08-18 11:23:28 +01:00
Budibase Staging Release Bot b2de52cf60 v0.9.105-alpha.21 2021-08-18 09:54:08 +00:00
Martin McKeaveney f07dcf7f55 Merge pull request #2401 from mslourens/update_datasource_name
Update the name of the datasource
2021-08-18 10:44:04 +01:00
Peter Clement 8bfdb35ff3 linting 2021-08-18 10:37:14 +01:00
Maurits Lourens e1ef03f55d fix lint issue 2021-08-18 11:24:25 +02:00
Budibase Staging Release Bot df21e9c83b v0.9.105-alpha.20 2021-08-18 09:10:38 +00:00
Andrew Kingston 7eafb9125a Merge pull request #2372 from mslourens/autocomplete_component
Autocomplete component
2021-08-18 10:01:47 +01:00
Peter Clement af9bb40bdd fixes organisation logo not showing 2021-08-18 00:02:17 +01:00
Maurits Lourens 3b099d945a fix lint issues 2021-08-18 00:04:54 +02:00
Maurits Lourens de944480da update the name of the datasource 2021-08-17 23:57:11 +02:00
Martin McKeaveney 2e30626e89 merge with dev 2021-08-17 21:27:30 +01:00
Martin McKeaveney 9360d7ebef Merge branch 'develop' of github.com:Budibase/budibase into feature/budibase-kubernetes 2021-08-17 21:26:16 +01:00
Maurits Lourens 19eeda608f update the modal text for updating the name of an app 2021-08-17 22:16:57 +02:00
Maurits Lourens eb383f68bc implement review comments 2021-08-17 19:57:11 +02:00
Budibase Staging Release Bot d06de6b8e3 v0.9.105-alpha.19 2021-08-17 16:04:50 +00:00
Martin McKeaveney 87bf640a5d conditionally apply username and password to couchdb auth 2021-08-17 16:48:02 +01:00
Budibase Staging Release Bot 1a9a61f92c v0.9.105-alpha.18 2021-08-17 14:31:01 +00:00
Andrew Kingston 63f0de886c Merge pull request #2387 from Budibase/ak-fixes
Misc fixes
2021-08-17 15:23:45 +01:00
Budibase Staging Release Bot 2a8e2d3175 v0.9.105-alpha.17 2021-08-17 13:36:30 +00:00
Andrew Kingston ca55d8ab31 Fix trailing comma in manifest 2021-08-17 14:28:56 +01:00
Martin McKeaveney 3b993b0fac Merge pull request #2385 from Budibase/feature/couchdb-auth-test
couchDB auth options
2021-08-17 14:26:05 +01:00
Andrew Kingston 3f7729ec1b Revert manifest change for multistep forms 2021-08-17 14:20:02 +01:00
Andrew Kingston 3d28965cb2 Revert form steps setting 2021-08-17 14:16:06 +01:00
Andrew Kingston 9adfccd249 Fix dynamic options with radio groups 2021-08-17 14:15:48 +01:00
Martin McKeaveney 5d560022c5 lint 2021-08-17 14:15:24 +01:00
Maurits Lourens 6aaf73788d implement review comments 2021-08-17 15:13:57 +02:00
Andrew Kingston becb7c6a3f Ensure options are always rendered with a default type of select 2021-08-17 14:12:23 +01:00
Peter Clement fc0d621124 Merge remote-tracking branch 'origin/develop' into pc-bug-fixes 2021-08-17 14:11:47 +01:00
Martin McKeaveney f4232bd7d7 couchDB auth options 2021-08-17 14:11:03 +01:00
Andrew Kingston a2e4f44e7f Ensure placeholder is null when undefined so avoid sometimes having a placeholder and sometimes not 2021-08-17 14:10:25 +01:00
Andrew Kingston 2496dd6f14 Add steps option to form 2021-08-17 14:10:03 +01:00
Andrew Kingston cbcffd0a4a Fix autoscreen-generated form component default settings 2021-08-17 13:58:51 +01:00
Budibase Staging Release Bot 21bd0c6a7a v0.9.105-alpha.16 2021-08-17 12:58:35 +00:00
Martin McKeaveney db0183e8cf Merge pull request #2379 from Budibase/fix/app-name-validation
adding alphanumeric app name validation
2021-08-17 13:49:50 +01:00
Maurits Lourens 8f80bc0141 Merge branch 'develop' into autocomplete_component 2021-08-17 14:26:57 +02:00
Budibase Staging Release Bot f2511931d0 v0.9.105-alpha.15 2021-08-17 12:16:22 +00:00
Andrew Kingston d23d11f6ef Merge branch 'dynamic-picker-options' of github.com:Budibase/budibase into dynamic-picker-options 2021-08-17 11:37:50 +01:00
Andrew Kingston 432b817d98 Remove notification when saving custom options 2021-08-17 11:36:33 +01:00
Andrew Kingston bc788273a0 Ensure both label and value are set when defining custom options 2021-08-17 11:34:46 +01:00
Andrew Kingston d71b7e4b77 Tidy up options drawer styles 2021-08-17 11:33:09 +01:00
Peter Clement ce370ca1d2 Merge remote-tracking branch 'origin/develop' into dynamic-picker-options 2021-08-17 11:26:42 +01:00
Peter Clement e5bca9fece text updates 2021-08-17 11:17:03 +01:00
Martin McKeaveney 2e4f32269b adding alphanumeric app name validation 2021-08-17 10:41:37 +01:00
Peter Clement 5151619782 Allow users to define custom picker options 2021-08-17 10:32:01 +01:00
Budibase Staging Release Bot 08ec960fab v0.9.105-alpha.14 2021-08-17 08:36:18 +00:00
Andrew Kingston c50d03d792 Merge pull request #2369 from Budibase/fix/screen-props
Fix screen settings not being saved
2021-08-17 09:28:43 +01:00
Budibase Release Bot a2efbb1338 v0.9.107 2021-08-17 06:25:14 +00:00
Martin McKeaveney 8e1e016c66 Revert "Feature/couchdb auth" 2021-08-17 07:16:43 +01:00
Maurits Lourens 62f7676cdf add autocomplete component and make it optional for optionsField and relationshipField 2021-08-16 23:31:51 +02:00
Budibase Staging Release Bot 7e54c860a1 v0.9.105-alpha.13 2021-08-16 20:54:33 +00:00
Maurits Lourens 87c59db02e fix lint issues 2021-08-16 22:07:15 +02:00
Maurits Lourens 459ba46c48 return validation errors 2021-08-16 21:15:15 +02:00
Budibase Staging Release Bot fe5d3fe1d4 v0.9.105-alpha.12 2021-08-16 17:37:03 +00:00
Andrew Kingston 36a744f577 Merge pull request #2339 from Budibase/custom-form-validation
Custom form validation
2021-08-16 18:29:44 +01:00
Budibase Release Bot 0cc16ee5c2 v0.9.106 2021-08-16 16:35:51 +00:00
Budibase Staging Release Bot 274986ae4a v0.9.105-alpha.11 2021-08-16 16:22:24 +00:00
Martin McKeaveney 2661d1c0b4 lint 2021-08-16 17:17:48 +01:00
Andrew Kingston 1f43ac3ab1 Fix screen settings not being saved 2021-08-16 17:01:34 +01:00
Martin McKeaveney 0bfbedac80 lint 2021-08-16 16:47:26 +01:00
Martin McKeaveney cedc78e490 match up env var in worker 2021-08-16 16:44:46 +01:00
Martin McKeaveney a06325cace readd couchDB url to env 2021-08-16 16:39:10 +01:00
Martin McKeaveney beb16a733e utility helper for determining correct couchDB URL 2021-08-16 16:38:00 +01:00
Martin McKeaveney 769c37a11d couchdb direct auth 2021-08-16 15:58:04 +01:00
Martin McKeaveney 0d6b0c887b named templates for local k8s DNS resolution 2021-08-16 15:15:07 +01:00
Martin McKeaveney a248084c56 budibase kubernetes support 2021-08-16 11:42:21 +01:00
Andrew Kingston 641e61773b Add ability for select options to be loaded from a data provider 2021-08-16 11:24:25 +01:00
Peter Clement a80655df04 Bug fix for unable to navigate from sql screen 2021-08-16 09:44:15 +01:00
Budibase Staging Release Bot 062ce04a00 v0.9.105-alpha.10 2021-08-16 08:13:57 +00:00
Andrew Kingston 73def04951 Merge pull request #2344 from Budibase/ak-fixes
Fixes and features for various issues
2021-08-16 09:04:13 +01:00
Budibase Staging Release Bot 12dc73655c v0.9.105-alpha.9 2021-08-13 13:16:28 +00:00
Andrew Kingston 706ba47e61 Merge branch 'develop' of github.com:Budibase/budibase into joe-tweaks 2021-08-13 13:53:30 +01:00
Budibase Staging Release Bot 1edd6d934e v0.9.105-alpha.8 2021-08-13 12:49:38 +00:00
Keviin Åberg Kultalahti f6218d8e0b Merge branch 'master' into develop 2021-08-13 14:41:49 +02:00
Andrew Kingston c9056c8ad5 Merge branch 'develop' of github.com:Budibase/budibase into joe-tweaks 2021-08-13 13:33:22 +01:00
Andrew Kingston b87a295773 Adding missing dep 2021-08-13 13:32:32 +01:00
Budibase Staging Release Bot 3792cd8030 v0.9.105-alpha.7 2021-08-13 11:50:38 +00:00
Andrew Kingston d79ea9364b Add static white and black color options to color picker 2021-08-13 12:39:57 +01:00
Andrew Kingston ec5e3e27a3 Add 12px options for margin and padding 2021-08-13 12:23:41 +01:00
Andrew Kingston 96992ed1bb Add over background button variant 2021-08-13 12:22:35 +01:00
Andrew Kingston c7687b6400 Add more size options for paragraphs and headings 2021-08-13 12:07:45 +01:00
Andrew Kingston 473f18d510 Tidy up device bindings provider 2021-08-13 11:34:11 +01:00
Andrew Kingston 47ca925003 Add global data bindings for mobile and tablet device sizes 2021-08-13 11:24:47 +01:00
Budibase Release Bot 892970234b v0.9.105 2021-08-13 08:08:23 +00:00
Budibase Staging Release Bot ec83a77ce9 v0.9.105-alpha.6 2021-08-12 14:20:20 +00:00
Peter Clement e49b8236a1 linting 2021-08-12 14:27:05 +01:00
Peter Clement c1d559c96f Change self host button text 2021-08-12 14:20:46 +01:00
Peter Clement 3ef05e3d36 Add default config to admin store 2021-08-12 14:20:23 +01:00
Andrew Kingston 54b7cb1265 Increase width of contraint select in custom validation drawer 2021-08-12 12:27:50 +01:00
Andrew Kingston f209781e7c Add duplicate button 2021-08-12 12:25:54 +01:00
Peter Clement 48c40446f0 Add link to account portal 2021-08-12 12:09:53 +01:00
Peter Clement b2bc9a5e20 Add self-hosting upgrade button to builder pane 2021-08-12 11:51:08 +01:00
Andrew Kingston 4275ceef33 Make dropzone file name a link to the file 2021-08-12 11:49:48 +01:00
Andrew Kingston 3c2b1dca0d Add gap between form components when using labels positioned above fields 2021-08-12 10:37:07 +01:00
Andrew Kingston cb55139cea Sort picker options alphabetically 2021-08-12 10:09:38 +01:00
Andrew Kingston f6cd99166a Hide formula fields from filter expressions until they can be searched 2021-08-12 10:03:56 +01:00
Andrew Kingston 72ab0c4158 Fix issue with duplicate icon in condtitional UI not being accounted for when using an update action 2021-08-12 09:55:41 +01:00
Andrew Kingston b77fed6766 Add duplicate action to filter drawer 2021-08-12 09:50:09 +01:00
Budibase Staging Release Bot be68c25334 v0.9.105-alpha.5 2021-08-12 08:49:04 +00:00
Martin McKeaveney 83b99be1d6 linting 2021-08-11 20:34:45 +01:00
Andrew Kingston da67adfffd Remove log statement 2021-08-11 18:16:30 +01:00
Andrew Kingston e1e6df31c3 Lint 2021-08-11 18:13:40 +01:00
Andrew Kingston d615513558 Fix validation value component always being an input 2021-08-11 16:46:01 +01:00
Andrew Kingston 9848df1a67 Fix min and max value validation for date fields 2021-08-11 15:56:21 +01:00
Budibase Staging Release Bot bf92322f9c v0.9.105-alpha.4 2021-08-11 14:56:17 +00:00
Andrew Kingston ac5cf884cf Merge branch 'develop' of github.com:Budibase/budibase into custom-form-validation 2021-08-11 15:51:45 +01:00
Andrew Kingston 0c5a34dacb Ensure checkbox always has a size class 2021-08-11 15:21:35 +01:00
Andrew Kingston 50247bd066 Merge branch 'develop' of github.com:Budibase/budibase into default-field-values 2021-08-11 15:13:30 +01:00
Andrew Kingston d1bc289f4b Merge branch 'develop' of github.com:Budibase/budibase into custom-form-validation 2021-08-11 15:09:04 +01:00
Andrew Kingston 99cb7c8789 Allow fields to dynamically update validation rules so that other fields can be referenced 2021-08-11 15:07:06 +01:00
Andrew Kingston cebfcb280b Prevent not-equals from failing on fields that are both empty 2021-08-11 14:59:12 +01:00
Andrew Kingston b79b75ad78 Add support for validating relationships 2021-08-11 14:34:22 +01:00
Martin McKeaveney 1678c86bf4 lint 2021-08-10 17:46:28 +01:00
Martin McKeaveney e2a86f160b fix date sorting 2021-08-10 17:41:11 +01:00
Martin McKeaveney 9053a84718 fix date sorting 2021-08-10 17:41:01 +01:00
Andrew Kingston ce29f27c89 Add custom validation support to all fields except relationships 2021-08-10 14:37:14 +01:00
Andrew Kingston b75614eca9 Combine table schema validation rules with custom validation rules when validating form fields 2021-08-10 14:36:47 +01:00
Andrew Kingston a041d8dcc7 Allow custom validation rules to use bindings or raw values 2021-08-10 14:36:00 +01:00
Martin McKeaveney ccb7f67458 ensure user metadata is created before link documents are created 2021-08-10 13:00:15 +01:00
Budibase Staging Release Bot 6e6c9371d5 v0.9.105-alpha.3 2021-08-10 10:51:18 +00:00
Kevin Åberg Kultalahti 5450d26962 Merge pull request #2317 from Budibase/fix/make-feedbackform-comment-optional
Makes the NPS Feedback Form options and comments optional
2021-08-10 12:42:06 +02:00
Budibase Staging Release Bot 9e2d0608e6 v0.9.105-alpha.2 2021-08-09 15:20:42 +00:00
PClmnt 79b2c16e84 Merge pull request #2318 from Budibase/quiet-emphasized-tabs
Add Quiet and Emphasized variants to the Tabs and Tab components
2021-08-09 16:13:03 +01:00
Peter Clement 2500b465e1 border fix 2021-08-09 15:56:05 +01:00
Peter Clement dc9d69910b fix underline conditional 2021-08-09 15:55:03 +01:00
Peter Clement 7a58e3c817 Add Quiet and Emphasized variants to the Tabs and Tab components 2021-08-09 15:47:30 +01:00
Keviin Åberg Kultalahti b1e57ad720 makes the second and third pages of the NPS feedback form optional 2021-08-09 15:43:50 +02:00
Budibase Staging Release Bot 4aac090719 v0.9.105-alpha.1 2021-08-06 20:51:57 +00:00
Martin McKeaveney 725e64f9cb Merge pull request #2147 from mslourens/prevent_space_in_url
replace spaces with underscores in screen routes
2021-08-06 21:42:47 +01:00
Maurits Lourens 10e8b54f4f Fix test 2021-08-06 21:46:44 +02:00
Budibase Staging Release Bot 01d75dc003 v0.9.105-alpha.0 2021-08-06 16:38:26 +00:00
mike12345567 0f341a5fd2 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-08-06 17:29:45 +01:00
mike12345567 a8eb067de3 Merge branch 'fix/apps-2195-2282-2283' of github.com:Budibase/budibase into develop 2021-08-06 17:14:31 +01:00
Budibase Release Bot ab8d942065 v0.9.104 2021-08-06 16:11:58 +00:00
Michael Drury 8a81218f8e Merge pull request #2296 from Budibase/fix/apps-2195-2282-2283
Fixing various issues caused by PouchDB allDbs call
2021-08-06 17:04:23 +01:00
Budibase Release Bot 3a8ee8eaca v0.9.103 2021-08-06 15:42:34 +00:00
mike12345567 506ff7dcd3 Linting. 2021-08-06 16:39:30 +01:00
mike12345567 be48677490 Fixes for a lot of issues generated by the use of the pouchdb allDbs call, which is not designed for multi-client DB setups like ours, using CouchDB method instead. 2021-08-06 16:38:07 +01:00
Budibase Staging Release Bot a5ab25f9df v0.9.103-alpha.1 2021-08-06 14:43:50 +00:00
mike12345567 5afba2c394 Adding a case for Firefox undefined bindings when checking validity. 2021-08-06 15:32:55 +01:00
Andrew Kingston 67be24b524 Add validation drawer and simplify HOC's for different field types 2021-08-06 14:54:00 +01:00
Budibase Staging Release Bot 9d32a3918d v0.9.103-alpha.0 2021-08-06 12:24:19 +00:00
mike12345567 6414614312 Merge branch 'develop' of github.com:Budibase/budibase into develop 2021-08-06 13:16:04 +01:00
mike12345567 a7ba02620d Linting. 2021-08-06 13:11:41 +01:00
mike12345567 5a45f85b1d Updating yarn locks. 2021-08-06 13:09:28 +01:00
mike12345567 bc84bab52c Merge branch 'master' of github.com:Budibase/budibase into develop 2021-08-06 13:04:54 +01:00
Budibase Release Bot 3c31350e86 v0.9.102 2021-08-06 11:59:59 +00:00
Michael Drury ae18e3408e Merge pull request #2286 from Budibase/fix/relationships-2167
Some fixes for internal and external relationships
2021-08-06 12:51:44 +01:00
mike12345567 29817892a8 Fixing test cases. 2021-08-06 12:33:04 +01:00
Budibase Release Bot fd251e9aeb v0.9.101 2021-08-05 21:32:50 +00:00
Martin McKeaveney 9751e84bed fix sql server integration 2021-08-05 22:15:40 +01:00
mike12345567 5a0ef45c29 Fixing issues with many to many relationships in SQL, sometimes not creating right relationships. 2021-08-05 19:49:30 +01:00
mike12345567 789922e5a2 Linting. 2021-08-05 19:26:00 +01:00
mike12345567 7624390f0b Fixing a variety of issues with internal relationships and external SQL relationships. 2021-08-05 19:24:29 +01:00
Maurits Lourens aa1d214c4d Merge branch 'develop' into prevent_space_in_url
# Conflicts:
#	packages/builder/src/components/design/PropertiesPanel/ScreenSettingsSection.svelte
2021-08-05 20:11:55 +02:00
Maurits Lourens fe3b81e72d implement review comments 2021-08-05 20:03:54 +02:00
Budibase Release Bot 07006b7a3c v0.9.100 2021-08-05 16:15:38 +00:00
Martin McKeaveney c2e80b0b63 Merge branch 'master' of github.com:Budibase/budibase 2021-08-05 17:04:26 +01:00
Martin McKeaveney 0b3c04d71c lint 2021-08-05 16:57:23 +01:00
Budibase Staging Release Bot 23081268d0 v0.9.99-alpha.6 2021-08-05 15:56:53 +00:00
Martin McKeaveney 05ec5dc70c Merge pull request #2260 from Budibase/fix/views-2209
Formulas and relationships in views
2021-08-05 16:43:59 +01:00
Martin McKeaveney fd837117da Merge pull request #2239 from mslourens/checkbox_sizes
add sizes to boolean field and checkbox component
2021-08-05 16:43:20 +01:00
Martin McKeaveney 7864f75a14 Merge pull request #2244 from mslourens/headers_in_webhook_automation_step
add headers input in outgoing webhook automation step
2021-08-05 16:43:04 +01:00
Martin McKeaveney 02a99f32cb updating attachment relative path so it works in all envs 2021-08-05 16:40:39 +01:00
Budibase Release Bot 7e26eb1cac v0.9.99 2021-08-05 15:32:36 +00:00
Martin McKeaveney 6f3abeb739 Merge pull request #2272 from Budibase/fix/export-2193
Fix exporting data from table
2021-08-05 16:18:13 +01:00
Budibase Staging Release Bot 0ee3df4ae0 v0.9.99-alpha.5 2021-08-05 13:48:48 +00:00
mike12345567 f1306332ea Merge branch 'develop' of github.com:Budibase/budibase into develop 2021-08-05 14:38:07 +01:00
mike12345567 105dfb5eb9 Fixing an issue with OIDC URL for preauth. 2021-08-05 14:36:10 +01:00
Budibase Staging Release Bot 9a21cbb8f8 v0.9.99-alpha.4 2021-08-05 12:48:02 +00:00
mike12345567 42c577ca26 Merge branch 'develop' of github.com:Budibase/budibase into develop 2021-08-05 13:39:51 +01:00
mike12345567 efcbe864c2 Defining fetch for third party image retrieval. 2021-08-05 13:39:40 +01:00
Budibase Staging Release Bot e76510b1f5 v0.9.99-alpha.3 2021-08-05 12:38:23 +00:00
Martin McKeaveney 92adc0c790 unpin versions 2021-08-05 13:05:33 +01:00
Martin McKeaveney 6e8924ff94 script for pinning dev versions of BB packages 2021-08-05 12:59:33 +01:00
Martin McKeaveney 357750edfa Merge branch 'develop' of github.com:Budibase/budibase into develop 2021-08-05 12:35:37 +01:00
Budibase Staging Release Bot 7b36c49521 v0.9.99-alpha.2 2021-08-05 11:08:37 +00:00
mike12345567 178ff115b2 Merge branch 'develop' of github.com:Budibase/budibase into develop 2021-08-05 12:00:47 +01:00
mike12345567 9197a6e124 Making old google/oidc callback endpoints public. 2021-08-05 12:00:33 +01:00
Budibase Staging Release Bot 709e34adde v0.9.99-alpha.1 2021-08-05 10:36:25 +00:00
mike12345567 e91289e10d Merge branch 'develop' of github.com:Budibase/budibase into develop 2021-08-05 11:28:04 +01:00
mike12345567 78a3a1cd09 Fixing issue with google callback URL not being used when it was previously set. 2021-08-05 11:27:51 +01:00
Budibase Staging Release Bot be13517dac v0.9.99-alpha.0 2021-08-05 10:00:35 +00:00
Martin McKeaveney dbeaf4444b Merge branch 'develop' of github.com:Budibase/budibase into develop 2021-08-05 10:53:20 +01:00
Martin McKeaveney 3d3db94917 re-add spectrum dep 2021-08-05 10:52:58 +01:00
mike12345567 83462a0eee Fixing merge issues. 2021-08-05 10:52:34 +01:00
mike12345567 f8599e1352 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-08-05 10:38:41 +01:00