Commit Graph

762 Commits

Author SHA1 Message Date
Martin McKeaveney 37f539c5a9 update view schema when table updated 2020-09-14 15:40:45 +01:00
mike12345567 09565e41d0 Adding new API endpoint which provides all definitions in one. 2020-09-14 15:34:09 +01:00
Andrew Kingston 609b039d4c Revert formatting to 80 print width 2020-09-14 14:35:03 +01:00
mike12345567 b6209d044a Updating some test cases which were failing silently and changing how environment want handled. 2020-09-14 14:32:20 +01:00
Andrew Kingston 590e7d810d Merge branch 'server-workflows' of github.com:Budibase/budibase into server-workflows 2020-09-14 11:53:19 +01:00
mike12345567 f213f567ef Adding delete record for when we build in contextual awareness. 2020-09-14 11:47:52 +01:00
Andrew Kingston 9df0dcb9ac Remove params from delete record workflow action as it is only a placeholder 2020-09-14 11:46:50 +01:00
Andrew Kingston 4636d5e376 Merge branch 'server-workflows' of github.com:Budibase/budibase into server-workflows 2020-09-14 10:34:36 +01:00
mike12345567 53e4531c5b Making worker thread decision based on environment variable (BUDIBASE_ENVIRONMENT) and some general tidy up, as well as fixing delete event emitter 2020-09-14 10:30:35 +01:00
Andrew Kingston d166d8072b Merge in master 2020-09-14 10:16:09 +01:00
Andrew Kingston 71388f47a4 Fix external workflow triggers not passing though instance ID 2020-09-14 09:12:17 +01:00
Andrew Kingston 56bbb645ad Merge branch 'server-workflows' of github.com:Budibase/budibase into server-workflows 2020-09-11 21:33:05 +01:00
Michael Shanks 0735eaa523 stop coercing values on the server - do on client instead 2020-09-11 21:24:52 +01:00
mike12345567 fc38871b66 Adding threading for when not running against PouchDB. 2020-09-11 18:47:22 +01:00
Martin McKeaveney 4d411dec62 attachments 2020-09-11 15:09:56 +01:00
Andrew Kingston 643f58125e Fix workflow filter logic block tagline 2020-09-11 14:46:22 +01:00
Michael Shanks 3b21b15259 fixing some broken tests 2020-09-11 09:29:23 +01:00
Michael Shanks 04f3ed5ec3 Merge branch 'master' into event-panel + binding fixes 2020-09-10 21:55:04 +01:00
Michael Shanks d3225cb51f events hooked up and working 2020-09-10 21:11:05 +01:00
mike12345567 b886c8f342 Adding joi validation to the workflow update and create to make sure structure is adhered to, this is built through a curried middleware, to validate on headers, body etc add multiple different validator middlewares to your endpoint. 2020-09-10 17:46:34 +01:00
Andrew Kingston 3bf0358716 Fix create user workflow action 2020-09-10 16:46:58 +01:00
Andrew Kingston 9077e89192 Fix record created trigger workflow block description 2020-09-10 15:29:35 +01:00
Andrew Kingston 52aaac8e44 Fix async loading of steps 2020-09-10 15:29:01 +01:00
mike12345567 3a591c13d0 Major update to server workflow backend, implementing a very basic queue API in between triggers and orchestration and then moving everything around to keep it generally more concise, creating a directory to handle all workflow related matters as they do not pertain to the API (running of workflows is a completely separate operation). 2020-09-10 15:00:21 +01:00
mike12345567 834a62934c Merge branch 'server-workflows' of https://github.com/Budibase/budibase into server-workflows 2020-09-10 11:44:59 +01:00
mike12345567 bd4afe891a Merge branch 'master' of https://github.com/Budibase/budibase into server-workflows 2020-09-10 11:44:33 +01:00
Andrew Kingston 766d8ac8fc Add all workflow blocks to server and remove concept of workflow environment 2020-09-10 11:29:35 +01:00
mike12345567 08aa221d04 Implementing the block definitions as list APIs for the workflow, meaning client has to retrieve structure from API instead of inherently knowing it. 2020-09-10 11:06:13 +01:00
Michael Shanks d63e03b852 added PATCH record route 2020-09-10 09:36:14 +01:00
Martin McKeaveney b177a36f89 lint, using bbui component 2020-09-09 16:27:46 +01:00
Martin McKeaveney 9c62d0073b tidy up 2020-09-09 13:45:47 +01:00
Martin McKeaveney 6fc72330dc custom flatpickr styling, tidy up 2020-09-09 13:44:36 +01:00
Martin McKeaveney 58fc6d291c using flatpickr, rollup config for CSS in the builder 2020-09-09 12:06:04 +01:00
Martin McKeaveney 8f0656bd3d date field working with HTML5 inputs. Needs more sophisticated parsing 2020-09-08 18:03:41 +01:00
Conor Mack 1cf777f841 viewBuilder.spec fix 2020-09-04 11:01:27 +01:00
Conor Mack 93dac03eaf Cypress Test Fix - createView.spec.js 2020-09-04 10:53:13 +01:00
Conor Mack ab0860bfc9 Update jest tests - viewbuilder 2020-09-03 15:32:15 +01:00
Conor Mack 2544fdf13c Merging with master and fixing conflicts 2020-09-03 15:12:07 +01:00
Martin McKeaveney 98c66c4bab Workflow fixes (#559)
* workflow fixes

* fixes for workflow - cypress test coverage

* remove log

* adding some assertions to slow test down

* force click create user

* cypress 5, small wait for user test

* remove cypress waiting eslint rule to fix user test

* click button directly

* test clicking

* try changing access level for validity

* lint
2020-09-03 12:02:15 +01:00
dependabot[bot] 28acb38f55 Bump bl from 4.0.2 to 4.0.3 in /packages/server
Bumps [bl](https://github.com/rvagg/bl) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/rvagg/bl/releases)
- [Commits](https://github.com/rvagg/bl/compare/v4.0.2...v4.0.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-02 15:54:50 +00:00
cmack 8dec9b5869 Single Calculation Views When Not Grouped 2020-09-02 11:52:32 +01:00
Martin McKeaveney b03eb8ce60 cypress tests, lint, feature complete 2020-08-24 15:48:34 +01:00
Martin McKeaveney 4d262b57ab view filters operational 2020-08-24 11:46:28 +01:00
Martin McKeaveney 655d1f009a custom filtering working, needs more test coverage 2020-08-21 17:05:26 +01:00
Martin McKeaveney da16f169ce Merge branch 'master' of github.com:Budibase/budibase into view-filters 2020-08-21 11:41:18 +01:00
Martin McKeaveney 4f0e0340fc v0.1.19 2020-08-21 11:31:53 +01:00
Martin McKeaveney 63e3bb16b0 v0.1.18 2020-08-21 10:19:54 +01:00
Martin McKeaveney 28c8331103 start of view filters 2020-08-20 16:31:43 +01:00
Martin McKeaveney d547604178 Merge pull request #545 from Budibase/custom-view-backend
Custom Views
2020-08-20 14:33:48 +01:00
Martin McKeaveney 370de9ceb7 adding deploy script to upload assets to s3 after release 2020-08-20 11:09:54 +01:00
Martin McKeaveney d2638e0150 merge 2020-08-19 17:14:30 +01:00
Martin McKeaveney 6f71870afd fix server unit tests 2020-08-19 17:09:30 +01:00
cmack 0a489eed13 Minor Tidyup - Logs, Dead Code, Comments 2020-08-19 10:34:20 +01:00
Martin McKeaveney e57dda576b tidy up and lint 2020-08-18 17:14:26 +01:00
Martin McKeaveney 33ec0cfa75 group by complete 2020-08-18 16:05:15 +01:00
Martin McKeaveney 0a60fd0bc6 deletion of views, statistics calculation popover, unit tests 2020-08-17 21:01:43 +01:00
Michael Shanks 3216b2f676 removed unecessary dependencies 2020-08-14 17:39:56 +01:00
Martin McKeaveney 6ad5ebbe06 began UI for custom views 2020-08-14 16:31:53 +01:00
Michael Shanks 30aed16951 remove references to material design components 2020-08-14 11:21:52 +01:00
Martin McKeaveney bf46067fe1 new view foundations 2020-08-13 15:04:19 +01:00
Martin McKeaveney 26fa101a38 v0.1.17 2020-08-11 15:33:01 +01:00
Martin McKeaveney 7e8e6f05cc v0.1.16 2020-08-10 22:30:11 +01:00
Martin McKeaveney e3ac8856a5 v0.1.14 2020-08-10 15:36:33 +01:00
Martin McKeaveney 9e00550eda Cypress Tests Running in CI (#524)
* cypress test setup

* running cypress in CI

* fixing tests after first time setup wizard

* bb api key

* API Key in right place

* adding env in cypress.json

* env var in setup

* lint

* API key not working

* fill in API key form if present

* allow more time for creation

* cypress server for debug

* video recording, better debugging

* Adding debug logs

* set node env

* cypress env

* cancel irrelevant test
2020-08-05 15:18:28 +01:00
Kevin Åberg Kultalahti 8ece205082 Merge pull request #523 from Budibase/feature/create-app-modifications
Feature/create app modifications
2020-08-03 17:54:54 +02:00
Michael Shanks a39f99cf7c bugfix: create app pointing to hardcoded standard-components version 2020-08-03 15:28:45 +01:00
kevmodrome 7ef4f2b2ac signup flow now works correctly 2020-08-03 16:26:28 +02:00
Martin McKeaveney 71d0849b71 v0.1.13 2020-08-03 11:45:39 +01:00
Michael Shanks bd28686a8c Merge pull request #464 from Budibase/dependabot/npm_and_yarn/packages/server/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19 in /packages/server
2020-08-03 11:13:35 +01:00
kevmodrome f78e816f20 setup sidebar 2020-07-31 10:46:23 +02:00
Martin McKeaveney 9dd4e85d63 v0.1.12 2020-07-27 17:50:36 +01:00
Martin McKeaveney e1cfea3bc3 fix typo 2020-07-27 17:48:35 +01:00
Martin McKeaveney 5e94fd4859 v0.1.11 2020-07-27 17:08:25 +01:00
Martin McKeaveney ea46ab56d8 lint 2020-07-27 16:12:06 +01:00
Michael Shanks b3145df87c Merge pull request #483 from mjashanks/delete_screen
Can delete screens
Uses new dropdown menu from bbui
2020-07-21 21:31:15 +01:00
Martin McKeaveney 2d29ba96d5 v0.1.10 2020-07-21 17:10:59 +01:00
Michael Shanks bac8249132 can delete screens 2020-07-21 15:01:32 +01:00
dependabot[bot] ae49b043e9 Bump lodash from 4.17.15 to 4.17.19 in /packages/server
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-21 09:31:16 +00:00
Martin McKeaveney 1fd4004c55 Merge pull request #462 from Budibase/nodemon-issue
Nodemon issue
2020-07-21 10:01:16 +01:00
Michael Shanks 499a7da572 dev script to replicate local dev db to remote couchDb, by appname 2020-07-17 17:02:27 +01:00
Michael Shanks 7238086333 component libraries - looking in wrong dir, in dev 2020-07-17 11:13:55 +01:00
Martin McKeaveney b9f6ecfe37 lint 2020-07-16 15:40:59 +01:00
Martin McKeaveney a257e4e620 fixing tests 2020-07-16 15:37:05 +01:00
Martin McKeaveney 6ae30e6d87 lint 2020-07-16 15:19:46 +01:00
Martin McKeaveney 3c67181881 nodemon delay + analytics fixes 2020-07-16 14:27:27 +01:00
Martin McKeaveney 26347e5ddc lint 2020-07-15 17:27:33 +01:00
Martin McKeaveney 32dd7dd245 events for web apps built and web apps deployed 2020-07-15 17:25:08 +01:00
Martin McKeaveney 8e99760d45 Merge branch 'master' of github.com:Budibase/budibase 2020-07-15 13:51:33 +01:00
Martin McKeaveney 925665d121 v0.1.9 2020-07-15 13:51:21 +01:00
Martin McKeaveney 60d503165e Merge pull request #450 from Budibase/electron-release-docs
docs for release
2020-07-15 13:43:10 +01:00
Martin McKeaveney 85bf27c17b fixing dev path when running in electron 2020-07-15 13:42:12 +01:00
Martin McKeaveney 847d3ddd1e docs for release 2020-07-15 12:05:00 +01:00
Joe ec96fa0739 Merge pull request #448 from Budibase/Map,-Icon,-Datalist-components-removed-from-UI
Map, Icon, Datalist components removed from frontend UI
2020-07-15 11:23:21 +01:00
Joe 298fac6db6 Map, Icon, Datalist removed from UI 2020-07-15 11:12:43 +01:00
Martin McKeaveney 665938dca4 v0.1.8 2020-07-15 10:44:11 +01:00
Martin McKeaveney 5149f9cc6f v0.1.7 2020-07-15 09:56:01 +01:00
Martin McKeaveney 020ef654db lint 2020-07-14 21:10:51 +01:00
Martin McKeaveney b4e70301a0 download component libraries from NPM tarball 2020-07-14 21:07:53 +01:00
Martin McKeaveney 22005bc990 formatting and tidy up 2020-07-14 16:00:58 +01:00
Martin McKeaveney 22428ea465 Merge pull request #441 from Budibase/Welcome-screen-links-update
Welcome screen links update
2020-07-14 14:44:52 +01:00
Joe 5a17eb99d8 Welcome screen links update 2020-07-14 13:02:34 +01:00
Martin McKeaveney ce7911a91c v0.1.6 2020-07-14 10:38:40 +01:00
Martin McKeaveney de75db7e8f posthog updates in builder 2020-07-14 10:19:21 +01:00
Martin McKeaveney 4092d0f686 v0.1.5 2020-07-14 09:16:53 +01:00
Martin McKeaveney e227512448 fix path when running in electron 2020-07-14 09:10:01 +01:00
Martin McKeaveney 1ffc7883ff v0.1.4 2020-07-14 08:23:46 +01:00
Martin McKeaveney eee2da24e1 lint 2020-07-14 08:21:22 +01:00
Martin McKeaveney 6d48588ff1 v0.1.3 2020-07-14 08:18:41 +01:00
Martin McKeaveney a717d15386 fix mac perm issue 2020-07-14 08:13:05 +01:00
Michael Shanks 80a597e1fc fix: create app failing from unknown folder copy issues 2020-07-14 07:02:46 +01:00
Martin McKeaveney f790a51156 adding dialog import 2020-07-13 18:11:19 +01:00
Martin McKeaveney 1c6897e3f2 correct electron path for budibase apps 2020-07-13 17:44:13 +01:00
Martin McKeaveney 936ff173e9 Merge branch 'master' of github.com:Budibase/budibase into beta-bugfixes 2020-07-13 17:27:26 +01:00
Martin McKeaveney 6b131b716e v0.1.2 2020-07-13 14:40:25 +01:00
Martin McKeaveney fccfc3fd5c beta bugfixes 2020-07-10 16:17:12 +01:00
Conor_Mack 3cf941defc Merge branch 'master' into colorpicker/palette-drag 2020-07-10 11:46:21 +01:00
cmack 39ee12c390 WIP: Palette drag to set 2020-07-09 16:30:00 +01:00
Martin McKeaveney 9b23d9eb51 v0.1.1 2020-07-09 15:30:11 +01:00
Michael Shanks 002e226865 Merge pull request #428 from mjashanks/master
Bugfixes and updated default application template
2020-07-09 15:18:25 +01:00
Michael Shanks 5c310c9231 lint fix 2020-07-09 15:05:56 +01:00
Martin McKeaveney 7bab03ee01 adding icns file 2020-07-09 15:00:42 +01:00
Michael Shanks 6840e4befa Merge branch 'master' of github.com:Budibase/budibase 2020-07-09 14:55:32 +01:00
Michael Shanks 0e225652bf yarn lock 2020-07-09 14:54:35 +01:00
Michael Shanks 006c965b70 Default app template - added screens 2020-07-09 14:47:54 +01:00
Martin McKeaveney f82b137554 resize icon 2020-07-09 14:36:05 +01:00
Martin McKeaveney f048105a03 New budibase logo 2020-07-09 14:26:47 +01:00
Martin McKeaveney ebc067e3dc pin electron version 2020-07-09 13:44:58 +01:00
Michael Shanks 237bad8bd5 Merge branch 'master' of github.com:Budibase/budibase 2020-07-09 13:12:59 +01:00
Martin McKeaveney 270428bd13 adding electron to dev deps 2020-07-09 11:38:07 +01:00
Martin McKeaveney 581d2b90cb v0.1.0 2020-07-09 11:31:21 +01:00
Martin McKeaveney 7222342c50 tidy up 2020-07-09 11:21:42 +01:00
Martin McKeaveney 08181e8a50 adding couchdb env 2020-07-08 21:53:15 +01:00
Martin McKeaveney 7c5da11836 PR Comments 2020-07-08 16:31:26 +01:00
Michael Shanks 7bd31f3dcf worflow save record action broken (no ctx.user) 2020-07-08 15:12:55 +01:00
Martin McKeaveney 1a33ab2e18 merge 2020-07-07 21:32:32 +01:00
Martin McKeaveney c953fa679a lint 2020-07-07 21:29:20 +01:00
Michael Shanks cf82bf9e1c Merge pull request #420 from mjashanks/bugfixes
Bugfixes from #387
2020-07-07 21:09:36 +01:00
Martin McKeaveney be8311aba2 tidy up 2020-07-07 20:17:09 +01:00
Martin McKeaveney 27975057c7 budibase complete deployment 2020-07-07 17:51:41 +01:00
kevmodrome 246d4beb80 remove som console.logs 2020-07-07 14:47:27 +02:00
kevmodrome 6ec6c4688a adds delete functionality to application 2020-07-07 14:44:05 +02:00
Martin McKeaveney f7d65deb5e extra index template for production 2020-07-06 19:43:40 +01:00
Michael Shanks 8dc4533c98 Merge branch 'master' into bugfixes 2020-07-06 14:51:25 +01:00
Kevin Åberg Kultalahti 2af46544c4 Merge pull request #413 from Budibase/features/settings-modal-api-keys-tab
Features/settings modal api keys tab
2020-07-06 14:51:30 +02:00
Michael Shanks cc1659f807 Login: allow edit of title & button text 2020-07-06 11:30:36 +01:00
kevmodrome c18bcc5499 lint fixes 2020-07-06 09:07:29 +02:00
kevmodrome 4112968942 use utility to get homedir instead of manually doing it 2020-07-06 09:06:59 +02:00
Michael Shanks 1d85ce5acb more understandable screenslot & default header on master screen 2020-07-03 21:48:34 +01:00
Michael Shanks 69b05d6f93 #416 auto init of budibase when electron starts 2020-07-03 13:03:50 +01:00
Martin McKeaveney 5ecc8d4a54 deployment E2E 2020-07-02 23:22:20 +01:00
Martin McKeaveney 993eb71019 Merge branch 'master' of github.com:Budibase/budibase into deployment 2020-07-02 20:52:50 +01:00
kevmodrome 0ae8c425ee fetching keys now done correctly 2020-07-02 21:25:25 +02:00
kevmodrome 160c3ef7c4 update process.env with new value 2020-07-02 21:01:34 +02:00
kevmodrome e3e5caaf97 adds getEnvironmentVariables function 2020-07-02 20:31:26 +02:00
kevmodrome a5d33854da dummy methods wired up to return values to the front-end 2020-07-02 18:38:00 +02:00
kevmodrome d8e6bd0ab9 sets up dummy back-end 2020-07-02 17:53:09 +02:00
Joe a0a2e7a734 Merge branch 'master' of https://github.com/Budibase/budibase into welcome-screen-ui-fix 2020-07-02 11:30:10 +01:00
Kevin Åberg Kultalahti cd0a58f89f Merge pull request #399 from Budibase/features/edit-application-info
Features/edit application info
2020-07-02 12:14:31 +02:00
Joe 72700bc4ca Welcome screen fix
Page scroll fix
Card responsiveness fix
Page spacing improved
Button color changed
2020-07-02 11:02:31 +01:00
kevmodrome 3c1a3cc759 remove unneeded appPackage route 2020-07-02 11:30:36 +02:00
Martin McKeaveney 9b2eca58c4 s3 awareness, authentication through API keys 2020-07-01 21:57:35 +01:00
Martin McKeaveney d176aa1d70 Merge branch 'master' of github.com:Budibase/budibase into deployment 2020-07-01 21:42:47 +01:00
Michael Shanks 46c8c558a0 apply border-box globally 2020-07-01 11:28:41 +01:00
Martin McKeaveney 975d715bd7 upload assets to s3 2020-06-29 19:15:43 +01:00
kevmodrome 4d4a1bc5b3 lint fix 2020-06-29 17:49:16 +02:00
kevmodrome 94f257e160 remove log 2020-06-29 17:21:22 +02:00
kevmodrome f39f913b4b adds functionality to update name and description of app 2020-06-29 17:18:43 +02:00
Kevin Åberg Kultalahti 2f255c70a4 Merge pull request #369 from Budibase/feature/settings-modal
Adds a Settings modal for the BB Apps
2020-06-29 16:01:20 +02:00
kevmodrome 5530e8f231 lint fix 2020-06-29 15:56:41 +02:00
kevmodrome eec2c4de7c correct put call to not remove password 😅 2020-06-29 15:55:12 +02:00
kevmodrome ba3046a1ca remove console log 2020-06-29 13:24:05 +02:00
kevmodrome d284dd0b02 fix wrong stuff coming back after updating user 2020-06-29 13:14:15 +02:00
Martin McKeaveney 7ed017209b cleaned up deploy code 2020-06-29 10:27:38 +01:00
Michael Shanks bbd030db71 bugfix: add inter and roboto mono fonts 2020-06-29 10:16:19 +01:00
kevmodrome 96f0de3366 lint fixes 2020-06-29 10:12:13 +02:00
kevmodrome 0ebb59dfa4 Merge remote-tracking branch 'origin' into feature/settings-modal 2020-06-29 10:08:23 +02:00
Michael Shanks 4677e76f79 merge from master 2020-06-26 15:41:42 +01:00
Martin McKeaveney 5b7e310ff6 Merge pull request #391 from Budibase/data-model-redesign
Data model redesign
2020-06-26 10:56:07 +01:00
Conor_Mack 4be1cd07b3 Merge pull request #392 from Budibase/bugfix/instance-name-login-template
Add _instanceName to login template
2020-06-26 10:35:42 +01:00
Conor_Mack 818ab3b4fc Add _instanceName to login template 2020-06-26 10:31:03 +01:00
kevmodrome 1440ed9fdd adds update functionality to users 2020-06-26 11:05:09 +02:00
Martin McKeaveney a597232814 adding renaming test 2020-06-26 09:55:15 +01:00
Martin McKeaveney dd0b66be69 lint 2020-06-25 22:43:10 +01:00
Martin McKeaveney 5b1b6382c6 tidy up 2020-06-25 22:35:52 +01:00
Martin McKeaveney 28b951e993 data model rewrite 2020-06-25 22:34:38 +01:00
Martin McKeaveney a7cd637087 linked records matched up by name 2020-06-25 20:35:03 +01:00
Martin McKeaveney 28c5756047 record keys as names 2020-06-25 20:04:58 +01:00
Michael Shanks 6592157527 bugfix: master screen not styleable 2020-06-25 17:46:43 +01:00
Joe 7c98a466e4 General UI fixing previous styling issues 2020-06-25 15:49:56 +01:00
Michael Shanks 4836092c20 yarn lock 2020-06-25 10:41:07 +01:00
Michael Shanks ef94892a1b merge from master 2020-06-24 18:05:49 +01:00
Martin McKeaveney ba74c0981e Merge pull request #367 from Budibase/backend-ui-update
Backend ui update
2020-06-24 17:33:22 +01:00
Martin McKeaveney 52358e93ad test fix 2020-06-24 17:26:14 +01:00
Michael Shanks 7f1f702cc4 Merge branch 'master' of github.com:Budibase/budibase into bugfixes 2020-06-24 17:19:29 +01:00
Conor_Mack 7f543bdf26 Merge pull request #360 from Budibase/builder/consolidating-missing-code
Instance name fix and consolidation of code
2020-06-24 17:11:08 +01:00
Martin McKeaveney 835b21e387 merge 2020-06-24 17:02:38 +01:00
Martin McKeaveney 35a1b1c03e update when linked field added 2020-06-24 16:56:13 +01:00
Michael Shanks 59afd2c572 Merge branch 'master' of github.com:Budibase/budibase 2020-06-24 16:42:41 +01:00
Martin McKeaveney db16af3937 fix test 2020-06-24 16:32:16 +01:00
Joe 0cf410b253 Merge branch 'master' into Css-update-to-reflect-BBUI 2020-06-24 15:35:40 +01:00