Commit Graph

4621 Commits

Author SHA1 Message Date
Budibase Staging Release Bot 2cc90fbb81 v0.9.140-alpha.0 2021-09-21 20:57:20 +00:00
Martin McKeaveney be1806110a merge with develop 2021-09-21 21:43:29 +01:00
Martin McKeaveney 61a77b1fd4 merge from master 2021-09-21 21:42:52 +01:00
Peter Clement e359962f93
Merge pull request #2678 from Budibase/feature/automation-data-types
Automation improvements
2021-09-21 21:39:22 +01:00
Martin McKeaveney 45981c62ef lint 2021-09-21 20:47:04 +01:00
Peter Clement fc4df8867c update icon to use hoverable 2021-09-21 20:30:58 +01:00
Martin McKeaveney 65471ef21c merge with develop 2021-09-21 20:30:18 +01:00
Martin McKeaveney a00598ce38 JSdoc 2021-09-21 20:28:33 +01:00
Martin McKeaveney b4f9fd4f12 changed events to constants, instantiated analytics client at right time 2021-09-21 20:21:15 +01:00
Budibase Release Bot bd91ae1f95 v0.9.139 2021-09-21 16:24:33 +00:00
Andrew Kingston 216a7c7a3f Ensure datasource containing the currently selected table is always expanded 2021-09-21 17:21:25 +01:00
Andrew Kingston 1ad2687f4f Set datasource to internal datasource upon loading internal datasource page 2021-09-21 17:21:01 +01:00
Budibase Staging Release Bot 1e8b8eb7a5 v0.9.125-alpha.20 2021-09-21 16:15:41 +00:00
Budibase Release Bot eaba4c2698 v0.9.138 2021-09-21 15:51:11 +00:00
Budibase Release Bot 64863fcf5e v0.9.137 2021-09-21 15:04:25 +00:00
Budibase Release Bot 7e0b4259fe v0.9.136 2021-09-21 13:47:15 +00:00
Maurits Lourens 9aecdedbfc remove the link from navigation bar when removing the screen 2021-09-21 15:16:10 +02:00
Budibase Release Bot 30a70a4a03 v0.9.135 2021-09-21 13:08:07 +00:00
Budibase Release Bot 02188f7ec0 v0.9.134 2021-09-21 11:15:43 +00:00
Peter Clement d15ff0c6e9 use color alias for actions instead of hard-coding the color 2021-09-21 12:05:58 +01:00
Martin McKeaveney 0993825286 analytics clients 2021-09-21 11:47:14 +01:00
Budibase Staging Release Bot 62307b0b55 v0.9.125-alpha.19 2021-09-21 09:12:18 +00:00
dependabot[bot] 7a7404bf0e
Bump tmpl from 1.0.4 to 1.0.5 in /packages/builder
Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-21 09:04:34 +00:00
Maurits Lourens a5b5b102fd replace all handlebars bindings, not just the first 2021-09-21 09:57:14 +02:00
Peter Clement a99cee39bc add multiselect / date / boolean types to automations 2021-09-20 16:23:33 +01:00
Andrew Kingston 8defbd1ed2 Remove old and no longer needed component-id data tag applied by styleable helper 2021-09-20 12:20:34 +01:00
Budibase Staging Release Bot c91e5ea39c v0.9.125-alpha.18 2021-09-20 09:55:05 +00:00
Andrew Kingston 08522724f0 Merge branch 'develop' of github.com:Budibase/budibase into dnd 2021-09-20 10:45:21 +01:00
Andrew Kingston a59c2db8ea Merge branch 'master' of github.com:Budibase/budibase into develop 2021-09-20 10:33:18 +01:00
Budibase Release Bot 69eb873164 v0.9.133 2021-09-20 09:20:41 +00:00
Andrew Kingston a17bdc3243 Update app ID parsing to be able to account for new tenant ID's and fix crash whenever a dev counterpart doesn't exist for a published app 2021-09-20 09:58:38 +01:00
Budibase Release Bot d01fc62552 v0.9.132 2021-09-17 17:55:09 +00:00
Budibase Staging Release Bot 70aad3b9fe v0.9.125-alpha.17 2021-09-17 16:47:21 +00:00
Budibase Release Bot df5c156b6e v0.9.131 2021-09-17 14:26:48 +00:00
Budibase Staging Release Bot 8bea39aa15 v0.9.125-alpha.16 2021-09-17 14:07:56 +00:00
Rory Powell 9236fdfd5a
Merge pull request #2635 from Budibase/feature/onboarding-backend
Password reset for budibase users
2021-09-17 14:58:53 +01:00
Budibase Staging Release Bot 21938fa94f v0.9.125-alpha.15 2021-09-17 13:27:49 +00:00
Rory Powell 72a0203829 Password reset for budibase users 2021-09-17 13:41:22 +01:00
Andrew Kingston 01e33b4bf8 Merge branch 'develop' of github.com:Budibase/budibase into dnd 2021-09-17 12:53:06 +01:00
Budibase Staging Release Bot ac132241ed v0.9.125-alpha.14 2021-09-17 08:59:43 +00:00
Maurits Lourens 0102e7284d fix merge conflicts, make arguments more consistent 2021-09-16 23:20:31 +02:00
Maurits Lourens 104a84d19b merge develop into branch 2021-09-16 22:15:09 +02:00
Andrew Kingston a89b3122d6 Reduce duplication in move componment handler from dnd callback 2021-09-16 17:39:39 +01:00
Andrew Kingston 63ebe2ac9a Merge branch 'develop' of github.com:Budibase/budibase into dnd 2021-09-16 17:34:40 +01:00
Andrew Kingston 3f249ab10b
Merge pull request #2606 from Budibase/responsive-portal
Responsive portal
2021-09-16 17:28:21 +01:00
Andrew Kingston 119891077b Fix cypress tests due to renaming of 'Create new app' text 2021-09-16 16:53:55 +01:00
Budibase Staging Release Bot 7b99737323 v0.9.125-alpha.12 2021-09-16 15:34:18 +00:00
Andrew Kingston f88ef064b1 Fix intermittent crash due to invalid iframe reference when hot reloading 2021-09-16 16:27:19 +01:00
mike12345567 19268e97b6 Removing console logs created during automation rework. 2021-09-16 16:24:32 +01:00
Andrew Kingston d368e54d17 Merge branch 'develop' of github.com:Budibase/budibase into responsive-portal 2021-09-16 16:06:41 +01:00
Budibase Staging Release Bot 9092c0ff5c v0.9.125-alpha.11 2021-09-16 14:54:58 +00:00
Michael Drury d9d32d88bc
Merge pull request #2618 from Budibase/feature/automation-query
Automation query functionality
2021-09-16 15:47:10 +01:00
Budibase Release Bot 596c953c24 v0.9.130 2021-09-16 14:44:06 +00:00
Rory Powell 0201e5b781
Merge pull request #2614 from Budibase/feature/onboarding-backend
Access controls for cloud, self, and regular budibase users
2021-09-16 15:39:14 +01:00
mike12345567 c759329a61 Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-query 2021-09-16 15:33:03 +01:00
Budibase Staging Release Bot b9e22726d5 v0.9.125-alpha.10 2021-09-16 14:26:27 +00:00
PClmnt 90eee7492b
Merge pull request #2610 from Budibase/feature/automation-redesign
Automation Redesign
2021-09-16 15:17:51 +01:00
mike12345567 04d845b9bd Merge branch 'feature/automation-redesign' of github.com:Budibase/budibase into feature/automation-query 2021-09-16 14:54:09 +01:00
Peter Clement 749e9441fb fix json parsing of test data 2021-09-16 14:52:23 +01:00
Peter Clement 3b57fd8a7e fix debounce / store test data bug 2021-09-16 14:48:55 +01:00
Budibase Staging Release Bot 922b5bc2cb v0.9.125-alpha.9 2021-09-16 13:35:20 +00:00
Martin McKeaveney e3ebc48060
Merge pull request #2169 from mslourens/collapse_expand_database_connections
Collapse and expand database connections
2021-09-16 14:26:25 +01:00
mike12345567 3113368c26 Making filter drawer in automations full width. 2021-09-16 13:45:22 +01:00
mike12345567 00bd9db7c9 Merge branch 'feature/automation-redesign' of github.com:Budibase/budibase into feature/automation-query 2021-09-16 12:44:16 +01:00
Peter Clement 1b8f7efbbb fix label not being rendered correctly 2021-09-16 12:15:32 +01:00
Maurits Lourens c318a1b3be fix tests by ensuring the budibase connection is expanded 2021-09-16 10:03:57 +02:00
Andrew Kingston 5cd1559a86 Prevent DND if target is a child of source 2021-09-16 07:35:19 +01:00
Andrew Kingston 4be4dd014d Add initial DND implementation with working functionality for dropping inside components 2021-09-16 07:28:59 +01:00
mike12345567 96f0f9b4fd Adding in backend implementation of the query step, as well as some front-end work to support the filter drawer within automations. 2021-09-15 19:02:44 +01:00
mike12345567 ed71f6bf75 Merge branch 'feature/automation-redesign' of github.com:Budibase/budibase into feature/automation-query 2021-09-15 17:33:00 +01:00
Maurits Lourens c22afdaf0f fix tests 2021-09-15 18:16:22 +02:00
Peter Clement 1dfb69db7e change naming within blocks 2021-09-15 16:59:15 +01:00
Budibase Staging Release Bot 108a783635 v0.9.125-alpha.8 2021-09-15 15:58:20 +00:00
Peter Clement d9f2bd2caa update reactivity of test data modal 2021-09-15 16:55:17 +01:00
Martin McKeaveney 9341ca0f19
Merge pull request #2120 from mslourens/delete_component_with_keyboard
Delete component with keyboard
2021-09-15 16:48:38 +01:00
Rory Powell 626b166346 Access controls for cloud, self, and regular budibase users 2021-09-15 15:45:43 +01:00
mike12345567 6232fa40ba Merge branch 'feature/automation-redesign' of github.com:Budibase/budibase into feature/automation-query 2021-09-15 14:21:29 +01:00
Peter Clement 294c05e6f0 fix build 2021-09-15 13:58:15 +01:00
mike12345567 73e7875c50 Fixing issues with shared -> Shared directory. 2021-09-15 13:45:38 +01:00
Peter Clement f75f0fc1d4 simplify parsing of internal / external actions 2021-09-15 12:58:20 +01:00
Budibase Release Bot 8b85e04a4b v0.9.129 2021-09-15 11:24:11 +00:00
Peter Clement 97c546107e small css updates 2021-09-15 11:52:42 +01:00
mike12345567 a79a0e9aa5 Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-query 2021-09-15 11:44:11 +01:00
Andrew Kingston c56b8816c2 Merge branch 'develop' of github.com:Budibase/budibase into responsive-portal 2021-09-15 10:53:59 +01:00
Budibase Staging Release Bot 6336409378 v0.9.125-alpha.7 2021-09-15 09:35:25 +00:00
Peter Clement c8d0031e7c Merge remote-tracking branch 'origin/develop' into feature/automation-redesign 2021-09-15 10:26:45 +01:00
Rory Powell fd92030dbd
Merge pull request #2607 from Budibase/feature/onboarding-backend
Redirects and linking between budibase and account portal
2021-09-15 10:25:46 +01:00
Budibase Staging Release Bot 28a97913af v0.9.125-alpha.6 2021-09-15 09:01:46 +00:00
Peter Clement f141647e72 incorrect file name 2021-09-15 09:57:06 +01:00
Andrew Kingston 1af2ba77f9 Merge branch 'develop' of github.com:Budibase/budibase into responsive-portal 2021-09-15 09:41:47 +01:00
Peter Clement 6809aa6e22 remove logs 2021-09-15 00:49:44 +01:00
Peter Clement cdcd582c41 Update icons 2021-09-15 00:49:44 +01:00
Peter Clement 3a5b27f744 add block connector line 2021-09-15 00:49:44 +01:00
Peter Clement b72999c027 Show test outputs and responses in modal 2021-09-15 00:49:35 +01:00
Peter Clement e65462858f adding external actions constant 2021-09-15 00:46:52 +01:00
Peter Clement d0b3db07a6 Require required schema fields before saving 2021-09-15 00:46:52 +01:00
Peter Clement e6e40f1225 Improve test automation modal and handling of data 2021-09-15 00:46:50 +01:00
Peter Clement 4514776e94 save automation on change / delete / create 2021-09-15 00:45:11 +01:00
Peter Clement 3e851c5eae Add new actions modal and integration with flowchart 2021-09-15 00:45:11 +01:00
Peter Clement e00e9f970f Update flow chart styling and event handling 2021-09-15 00:45:07 +01:00
Peter Clement c70ca7badc Add triggers to setup modal 2021-09-15 00:43:25 +01:00
Peter Clement ca866378d0 add splash screen to automation 2021-09-15 00:43:25 +01:00
Budibase Staging Release Bot 3fe70fa7ca v0.9.125-alpha.5 2021-09-14 16:39:38 +00:00
Michael Drury 12f364e296
Merge pull request #2598 from Budibase/feature/automation-rework
Automation backend rework
2021-09-14 17:30:26 +01:00
Andrew Kingston 1ab4e50895 Update styles in normal user app portal 2021-09-14 16:38:47 +01:00
Andrew Kingston 4d76be20f9 Make apps table in portal mobile friendly 2021-09-14 16:21:30 +01:00
Rory Powell b2471594cf Move account portal redirect to top of auth level 2021-09-14 15:57:34 +01:00
Rory Powell 8e9c1aa204 Navigate between budibase and account portal 2021-09-14 15:49:59 +01:00
Rory Powell 9433a1e360 Redirect to account portal login page in the cloud 2021-09-14 14:18:13 +01:00
Rory Powell 6b42864fc7 Revert vite changes 2021-09-14 13:04:55 +01:00
Rory Powell 3ab39d1a1b Replace 'sandbox' with 'cloud' in builder, reuse 'SELF_HOSTED' flag 2021-09-14 13:03:38 +01:00
mike12345567 e94c629bab Adding concept of internal and external actions. 2021-09-14 12:40:19 +01:00
Andrew Kingston fd20e733a8 Improve email template screen layout 2021-09-14 12:36:29 +01:00
Andrew Kingston 1ecfd93c96 Update config checklist to be mobile friendly 2021-09-14 12:32:04 +01:00
Andrew Kingston a50f1ef981 Update updates page to be mobile friendly and look better 2021-09-14 12:28:23 +01:00
Andrew Kingston 10d59b8370 Update theming page to be mobile friendly 2021-09-14 12:28:07 +01:00
Budibase Release Bot 0b5f6956a4 v0.9.128 2021-09-14 10:45:22 +00:00
Budibase Staging Release Bot 6748b75efd v0.9.125-alpha.4 2021-09-14 10:28:17 +00:00
mike12345567 daef4c2d64 Fixing test cases, making it possible to still run automations via env variable. 2021-09-14 11:18:02 +01:00
Budibase Release Bot 5d2a04a308 v0.9.127 2021-09-13 17:44:30 +00:00
Andrew Kingston 43297e2061 Make portal organisation page mobile friendly 2021-09-13 16:59:15 +01:00
Andrew Kingston 493ee932a4 Increase z-index of mobile drawer menu to fix email editor overlapping it 2021-09-13 16:45:23 +01:00
Andrew Kingston c1a97d3df3 Make email template page more mobile friendly 2021-09-13 16:43:54 +01:00
Andrew Kingston 63af684dd0 Remove unnecessary classname 2021-09-13 16:42:59 +01:00
Andrew Kingston 896e5c3b76 Make email template page somewhat mobile friendly 2021-09-13 16:42:07 +01:00
Budibase Release Bot 74782df087 v0.9.126 2021-09-13 15:41:29 +00:00
Martin McKeaveney 08c3bd467b fix for apps with undefined names 2021-09-13 16:33:26 +01:00
Andrew Kingston 3d9d00b0a3 Make portal email config page mobile friendly 2021-09-13 16:17:48 +01:00
Andrew Kingston c2340187df Fix alignment of SSO configs, clean up style, make auth page mobile friendly 2021-09-13 16:15:52 +01:00
Andrew Kingston 7534d403d2 Fix alignment and spacing of SSO providers 2021-09-13 16:05:26 +01:00
Andrew Kingston 7f08d0b328 Make users page responsive 2021-09-13 16:02:09 +01:00
Andrew Kingston 67d52bd140 Reduce portal padding on mobile 2021-09-13 16:01:47 +01:00
Andrew Kingston 9a92993226 Make core portal layout responsive with mobile drawer menu 2021-09-13 15:38:06 +01:00
Budibase Staging Release Bot 6fd23ee518 v0.9.125-alpha.3 2021-09-13 14:13:00 +00:00
Budibase Release Bot 69f137bafb v0.9.125 2021-09-13 11:29:41 +00:00
Budibase Staging Release Bot 4cf8223859 v0.9.125-alpha.2 2021-09-13 10:51:41 +00:00
Budibase Staging Release Bot 67eab30a2b v0.9.125-alpha.1 2021-09-10 16:11:09 +00:00
Budibase Staging Release Bot 05d2888ec6 v0.9.125-alpha.0 2021-09-10 13:53:42 +00:00
Martin McKeaveney ca361e0efd merge with master 2021-09-10 14:43:03 +01:00
Budibase Staging Release Bot 5de49127b0 v0.9.123-alpha.7 2021-09-10 11:20:51 +00:00
Andrew Kingston 10182e19c3
Merge pull request #2576 from Budibase/responsive-preview
Responsive preview
2021-09-10 12:13:46 +01:00
mike12345567 06d17827b6 Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-rework 2021-09-10 11:16:43 +01:00
Budibase Staging Release Bot 1fca6ed20e v0.9.123-alpha.6 2021-09-10 09:15:55 +00:00
Budibase Release Bot 16ab8098cb v0.9.124 2021-09-10 08:33:24 +00:00
Budibase Staging Release Bot 7c5b4ca927 v0.9.123-alpha.5 2021-09-10 07:56:31 +00:00
Andrew Kingston b04d983252 Fix bug with determining checklist progress 2021-09-10 08:25:30 +01:00
Budibase Staging Release Bot b8f000092a v0.9.123-alpha.4 2021-09-09 17:43:54 +00:00
mike12345567 01ca02ea9c Merge branch 'develop' of github.com:Budibase/budibase into feature/automation-rework 2021-09-09 16:33:41 +01:00
Budibase Release Bot 5079d3434f v0.9.123 2021-09-09 15:04:36 +00:00
Budibase Staging Release Bot 4a8a87fb47 v0.9.123-alpha.3 2021-09-09 13:51:49 +00:00
Budibase Staging Release Bot 3da6dc75e3 v0.9.123-alpha.2 2021-09-09 13:04:44 +00:00
Andrew Kingston 3d0f7125d2 Merge branch 'develop' of github.com:Budibase/budibase into responsive-preview 2021-09-09 13:56:18 +01:00
Andrew Kingston d38f5ef163 Merge branch 'develop' of github.com:Budibase/budibase into custom-theming 2021-09-09 11:57:55 +01:00
Martin McKeaveney 1b1675747c
Merge pull request #2556 from mslourens/checklist_item_navigation
add link to checklist items for direct navigation (and lint issues)
2021-09-09 11:16:38 +01:00
Andrew Kingston 395214eb1c Merge branch 'develop' of github.com:Budibase/budibase into responsive-preview 2021-09-09 10:25:24 +01:00
mike12345567 b00f8764cb Updating automations system to return the inputs and outputs of each step. 2021-09-08 14:08:22 +01:00
Budibase Staging Release Bot 00f01181a3 v0.9.123-alpha.1 2021-09-08 12:50:22 +00:00
Andrew Kingston 87f3659ba4 Align component selection list and preview controls to top of center panel 2021-09-08 09:54:10 +01:00
Andrew Kingston c5cd2fb64a Add feature flag to determine support for previewing on different device sizes 2021-09-08 09:46:20 +01:00
Andrew Kingston 749a26c5c5 Remove box shadow and padding around preview html element 2021-09-08 09:39:36 +01:00
Andrew Kingston dea0b02a1f Leave builder preview always the same size and depend on app to resize itself 2021-09-07 16:02:47 +01:00
Andrew Kingston 47e6504c14 Add preview device selection buttons and pass device preview down to client app 2021-09-07 16:02:11 +01:00
Maurits Lourens 33104fb1d1 fix test 2021-09-06 20:23:33 +02:00
Andrew Kingston 97e491d045 Merge branch 'develop' of github.com:Budibase/budibase into custom-theming 2021-09-06 18:23:08 +01:00
Budibase Staging Release Bot 70a66919f0 v0.9.123-alpha.0 2021-09-06 16:38:38 +00:00
Andrew Kingston ca9df2764d Merge branch 'develop' of github.com:Budibase/budibase into custom-theming 2021-09-06 17:29:51 +01:00
mike12345567 d12deceee5 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-09-06 17:27:29 +01:00
Maurits Lourens a3065bca36 fix tests 2021-09-06 17:55:19 +02:00
Andrew Kingston 44dd731be8 Add button to reset theme to default and fix determination of theme 2021-09-06 16:51:40 +01:00
Budibase Release Bot eff58fa8b4 v0.9.122 2021-09-06 15:45:10 +00:00
Andrew Kingston b11deece29 Fix button theming and add nav text theming 2021-09-06 16:23:12 +01:00
Budibase Staging Release Bot 545a0fc5cd v0.9.120-alpha.4 2021-09-06 14:57:36 +00:00
Budibase Release Bot 22f5c625ce v0.9.121 2021-09-06 14:26:46 +00:00
Maurits Lourens 01f3851c9a add link to checklist items for direct navigation (and lint issues) 2021-09-06 15:16:21 +02:00
Budibase Release Bot fe0adcde7d v0.9.120 2021-09-06 13:13:46 +00:00
Budibase Staging Release Bot 6367c6d746 v0.9.120-alpha.3 2021-09-06 10:48:29 +00:00
Maurits Lourens 52454c15fa fix exporting internal tables 2021-09-06 12:07:05 +02:00
Budibase Staging Release Bot e68fa5b6af v0.9.120-alpha.2 2021-09-06 07:05:56 +00:00
Budibase Staging Release Bot 866f4187e0 v0.9.120-alpha.1 2021-09-03 14:55:28 +00:00
Andrew Kingston 5568ab084b Add custom theme options for button roundedness and header color 2021-09-03 15:28:35 +01:00
Budibase Staging Release Bot e140e88e58 v0.9.120-alpha.0 2021-09-03 11:16:31 +00:00
mike12345567 b14e085223 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-09-03 12:08:06 +01:00
Budibase Release Bot 8c0977852c v0.9.119 2021-09-03 10:55:17 +00:00
Andrew Kingston 7ee7feca16 Add custom theming for primary color and primary hover color to form components 2021-09-03 11:50:09 +01:00
Budibase Release Bot 5b174c6484 v0.9.118 2021-09-02 15:56:14 +00:00
Budibase Staging Release Bot 19d31e0cea v0.9.117-alpha.4 2021-09-02 15:17:15 +00:00
Andrew Kingston 5d1be13c42 Hide state bindings if feature is not available 2021-09-02 11:39:41 +01:00
Andrew Kingston dbbcf4052e Hide state action in old apps and add working basic implementation of theming 2021-09-02 11:38:41 +01:00
Budibase Staging Release Bot 42e614be21 v0.9.117-alpha.3 2021-09-01 15:16:35 +00:00
Andrew Kingston 1b9916a89d
Merge pull request #2502 from Budibase/lab-day-state
App state
2021-09-01 16:08:13 +01:00
Maurits Lourens 49e7e405d2 only show delete confirmation when no input or textarea is focussed 2021-08-31 15:46:30 +02:00
Budibase Staging Release Bot 0fbe0a9a73 v0.9.117-alpha.2 2021-08-31 13:37:12 +00:00
Budibase Release Bot 74e5224e32 v0.9.117 2021-08-31 13:04:48 +00:00
Budibase Staging Release Bot 68d9c75971 v0.9.117-alpha.1 2021-08-31 12:50:22 +00:00
Budibase Staging Release Bot bf7e43762f v0.9.117-alpha.0 2021-08-31 12:32:55 +00:00
Martin McKeaveney 23f54498b2 Merge branch 'develop' of github.com:Budibase/budibase into develop 2021-08-31 13:23:57 +01:00
Martin McKeaveney 39aa8e8716 removing merge HEAD 2021-08-31 13:23:46 +01:00
Martin McKeaveney 2f45c24fba
Merge pull request #2499 from mslourens/fix_upload_logo
fixes uploading organisation logo
2021-08-31 13:13:31 +01:00
Martin McKeaveney 9be9eb8789 merge with master 2021-08-31 13:10:08 +01:00
Andrew Kingston 37f92f1ee0 Merge branch 'develop' of github.com:Budibase/budibase into lab-day-state 2021-08-31 10:33:31 +01:00