Commit Graph

442 Commits

Author SHA1 Message Date
Andrew Kingston 5807488f19 Add PLUGINS_DIR env var and show example mount for HMR of plugins 2022-08-16 15:14:47 +00:00
Jonny McCullagh dfb368d3f3 fix sed apostrophe error and couchdb path 2022-08-16 15:08:00 +01:00
Andrew Kingston 16568f42ff Merge branch 'plugins-dev-experience' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-16 09:33:17 +00:00
Andrew Kingston 1ef1cc84ad Proxy vite HMR websocket in dev 2022-08-16 09:25:16 +00:00
Andrew Kingston 6093da79d6 Add hot reloading for component plugins via watched plugin directory 2022-08-15 22:23:45 +01:00
Jonny McCullagh 625f36db7c Merge pull request #7226 from Budibase/azureappservice
single image build data path for azure
2022-08-11 15:18:24 +01:00
Jonny McCullagh 4c837f8e86 single image build data path for azure 2022-08-11 12:08:56 +01:00
Rory Powell 21f1970bf3 Revert proxy image change 2022-08-10 14:32:07 +01:00
Rory Powell ae5f0464b5 Merge pull request #7121 from Budibase/proxy-env-support-and-webhook-limiting
Add separate rate limiting config for webhooks + environment variable support
2022-08-10 09:00:20 +01:00
Rory Powell d36ff097ee Update posthog token 2022-08-08 14:03:04 +01:00
Rory Powell c94d916050 Add seperate rate limiting config for webhooks + environment variable support 2022-08-05 17:41:55 +01:00
mike12345567 bd7ace561a Merge branch 'master' of github.com:Budibase/budibase into develop 2022-07-22 19:14:35 +01:00
mike12345567 ccdf3cf901 Moving the single image healthcheck script to be within the single image directory and updating it to look for the environment variable file. 2022-07-19 14:39:52 +01:00
mike12345567 6f78b5eea8 Merge branch 'develop' of github.com:Budibase/budibase into labday/backups 2022-07-18 14:16:39 +01:00
mike12345567 a8a7bea658 Merge branch 'develop' of github.com:Budibase/budibase into labday/backups 2022-07-18 13:59:46 +01:00
Jonny McCullagh 4605308e22 WAzure App Service image to docker registry 2022-07-18 12:21:25 +01:00
mike12345567 f9547ba3ef Removing the volume tags from the old directories, instead focusing on the single data directory that is now used - #6715. 2022-07-15 11:08:03 +01:00
Michael Drury 9924c33f9b Merge pull request #6636 from Budibase/omnibus-action
Single image pipeline
2022-07-11 11:12:09 +01:00
mike12345567 e3e2892300 Updating dockerfile to be friendly to volume usage, as well as pre-filling with uuids rather than static secrets. 2022-07-08 18:33:07 +01:00
mike12345567 6a1c5b235d Moving files around to make single image build easier to follow, getting all data directories into one place for easy volume management. 2022-07-08 14:28:09 +01:00
mike12345567 f0d324c675 Adding missing environment variable. 2022-07-06 16:33:40 +01:00
mike12345567 e5ddcd9f86 Adding MinIO handling, backing up to disk by bucket name. 2022-06-30 20:26:49 +01:00
Andrew Kingston f49e2886ca Add env vars to hosting.properties and helm chart 2022-06-30 11:34:41 +01:00
Andrew Kingston 467cc27f47 Add env vars to automatically create initial admin user on first run 2022-06-30 11:28:52 +01:00
Jonny McCullagh 77725c1a74 update the readme 2022-06-24 18:59:32 +01:00
Jonny McCullagh 042eec5841 rename default nginx site config 2022-06-24 18:35:18 +01:00
Jonny McCullagh f00c8cc69f add support for Azure App Service 2022-06-24 17:48:34 +01:00
Jonny McCullagh af5d1c9647 restart nginx 2022-06-23 15:08:56 +01:00
Jonny McCullagh d7c11cfc46 fixes for single image build 2022-06-23 15:03:09 +01:00
Jonny McCullagh ecbc561a06 new lines at end of files 2022-06-22 14:38:45 +01:00
Jonny McCullagh a2f5d8212b add cron to renew cert 2022-06-22 13:57:46 +01:00
Jonny McCullagh b0bf8a2d11 add letsencrypt to single docker image 2022-06-22 13:38:33 +01:00
mike12345567 2a17e9f732 Review comments. 2022-06-22 12:40:33 +01:00
mike12345567 b42e0c1c5e Adding command for multiarch building with buildx, need to install qemu on Linux to make this work. 2022-06-21 19:52:44 +01:00
mike12345567 9ad9860a9c Fixing cleanup script, adding ARM support to dockerfile, as well as adding ARM client. 2022-06-21 17:56:55 +01:00
mike12345567 af60582dad Slimming build down from 4GB to 1.8GB for single image. 2022-06-16 20:38:24 +01:00
mike12345567 148c7010e8 Updating the single image docker build to pin versions before build to allow it to work with develop etc. Also optimising the image a bit so that it can be built significantly faster. 2022-06-16 19:30:34 +01:00
Rory Powell 396a07cac5 Merge branch 'release' into feature/event-backfill 2022-06-09 15:21:49 +01:00
Peter Clement 2b117a1a35 update csp to account for certain s3 addresses 2022-06-07 11:03:33 +01:00
Rory Powell f47cee2ab6 Update lockfiles 2022-06-06 16:33:10 +01:00
Rory Powell a4eef3daab Add awareness of deployment environment 2022-06-01 14:10:00 +01:00
Kacper eab84b4c63 Content Security Policy fix for S3 upload
CSP allows wildcard only at first element of FQDN, so policy `*.s3.*.amazonaws.com` is invalid cause it contains second wildcard in the middle of FQDN.

nginx.prod.conf.hbs is not parsed by real handlebarsJS but manual way with regex and replacements. It's impossible to use `{{#each}}` so I've hardcoded all regions available for S3 basing on documentation under: https://docs.aws.amazon.com/general/latest/gr/s3.html
2022-05-05 22:26:57 +02:00
Martin McKeaveney 70fce03c09 updating helm chart for storage classes 2022-04-27 12:42:57 +01:00
Rory Powell be16540a8f Replace spectrum with custom CSS 2022-04-25 16:39:44 +01:00
Rory Powell 9e7cec7c01 Merge branch 'develop' into labday/nginx-error-page 2022-04-25 16:30:24 +01:00
Andrew Kingston 4897607860 Merge pull request #5208 from Budibase/portainer-template
Add portainer template
2022-04-05 14:19:47 +01:00
Michael Drury 130a02889a Merge pull request #5209 from Budibase/labday/single-docker
Single docker file lab-day
2022-04-05 12:16:09 +01:00
mike12345567 6dd50eb25a Review comments. 2022-04-05 11:33:55 +01:00
mike12345567 1f982428e2 Merge branch 'develop' of github.com:Budibase/budibase into labday/single-docker 2022-04-05 11:31:02 +01:00
Martin McKeaveney 2050645d80 fix CSP variables 2022-04-04 15:22:31 +01:00
mike12345567 05af8cafc2 Fixing test case. 2022-04-01 13:47:38 +01:00
Andrew Kingston 60cffc3eac Add portainer template 2022-04-01 12:52:55 +01:00
mike12345567 28e47a5fa8 Adding volumes. 2022-04-01 12:50:26 +01:00
mike12345567 a1f4a237f0 Minor changes to get BB client and manifest included correctly. 2022-04-01 12:37:01 +01:00
mike12345567 4b7ffbbce7 Single docker container configuration. 2022-04-01 01:00:52 +01:00
Rory Powell 5d2205a9bb Add static html error page to nginx for 502, 503, 504 2022-03-31 15:58:45 +01:00
Martin McKeaveney c86daa60c8 adding string interpolation syntax in NGINX 2022-03-31 12:13:42 +01:00
Martin McKeaveney f786701c7a adding intercom kit to CSP, and variables 2022-03-31 12:09:55 +01:00
Martin McKeaveney 034408b3c2 merge with master 2022-03-30 15:44:22 +01:00
Andrew Kingston cd84bd3f54 Allow data URI's for image sources and font sources 2022-03-28 16:08:25 +01:00
Rory Powell 69b2b38aea Merge branch 'master' into merge-master 2022-03-25 13:10:37 +00:00
Andrew Kingston bedbf4bcae Merge branch 'develop' of github.com:Budibase/budibase into feature/map-actions 2022-03-25 12:00:17 +00:00
Rory Powell 36a7323676 Merge branch 'master' into fix/cross-tenant-apps-with-session 2022-03-25 10:53:10 +00:00
Martin McKeaveney 14c75b2907 update always to unless-stopped 2022-03-24 17:35:35 +00:00
Rory Powell 5851525c88 Merge branch 'master' into fix/cross-tenant-apps-with-session 2022-03-23 16:45:36 +00:00
Rory Powell a68abf2730 Fix cross tenant apps with session 2022-03-23 16:45:06 +00:00
Rene Pot 6e0b29667d fix broken docs links 2022-03-23 14:47:27 +01:00
Martin McKeaveney 0bf5d3a8d4 watchtower should restart if it crashes 2022-03-23 09:52:27 +00:00
Martin McKeaveney e2d9811474 increasing client max body size for uploads 2022-03-21 15:24:39 +00:00
Andrew Kingston d89b12c57d Change dev docker-compose restart policy to on-failure to stop running BB docker containers 247 2022-03-15 11:17:32 +00:00
Martin McKeaveney 14cffcd6ff merge 2022-03-08 12:40:41 +01:00
Martin McKeaveney 975eb0b99e merge from master 2022-03-08 12:34:27 +01:00
mike12345567 63bb4f34c4 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-03-04 11:25:32 +00:00
Martin McKeaveney b28bffbb15 Merge pull request #4631 from Budibase/ci/deploy-proxy
removing need for handlebars in nginx script, automating proxy servic…
2022-03-03 09:06:49 +00:00
Martin McKeaveney 81f34a50fa allowing iframes from HTTPS URLs 2022-03-02 22:43:41 +01:00
mike12345567 2c4b36e4f9 Fixing an issue found with nginx + minio. 2022-02-25 15:54:39 +00:00
Martin McKeaveney 1cbca0578a removing need for handlebars in nginx script, automating proxy service deployment 2022-02-22 13:24:21 +01:00
Rory Powell 0f3df713d0 Replace location specific with global http host rule 2022-02-21 10:46:45 +00:00
Rory Powell bd73f8fd25 Forward Host header to worker and server through NGINX 2022-02-21 10:22:26 +00:00
Rory Powell c326771cb0 Merge pull request #4565 from Budibase/update-nginx-dev
Add 'location = /' -> 4001 to nginx dev conf
2022-02-18 17:39:02 +00:00
Martin McKeaveney a09fd51fbd updating airgapped docker build script 2022-02-18 15:43:07 +01:00
Rory Powell da9be1b20a Add 'location = /' -> 4001 to nginx dev conf 2022-02-18 11:18:59 +00:00
Martin McKeaveney bfaca430da Create hosting.properties 2022-02-17 00:30:28 +01:00
Martin McKeaveney b259bcc9b6 updated CSP to allow font awesome 2022-02-16 16:54:15 +01:00
Martin McKeaveney a7a82dc679 adding k8s resolver and updating watchtower variable 2022-02-16 15:33:57 +01:00
Martin McKeaveney 09eb276c73 relevant image name 2022-02-16 14:24:52 +01:00
Martin McKeaveney 387e5035d1 update gitignore 2022-02-16 14:16:06 +01:00
Martin McKeaveney a85f667dbe templatize nginx configuration into one prod configuration and add NPM scripts to manage 2022-02-16 14:12:53 +01:00
Martin McKeaveney dd6f77684c increasing burst limit on k8s 2022-02-16 12:24:43 +01:00
Martin McKeaveney 687ff5acd6 removing exposed ports from docker configuration 2022-02-15 10:49:41 +01:00
Martin McKeaveney e7233f9086 increase burst limit, remove log mounts 2022-02-14 17:39:10 +01:00
Martin McKeaveney 57e554a98b fixes for k8s 2022-02-11 19:04:27 +01:00
Martin McKeaveney 27c0eafaf9 CSP fixes 2022-02-11 16:05:35 +01:00
Martin McKeaveney e1f78a326b set correct port for worker 2022-02-11 15:39:18 +01:00
Martin McKeaveney b6320f14cc Merge branch 'fix/nginx' of github.com:Budibase/budibase into fix/nginx 2022-02-11 15:14:40 +01:00
Martin McKeaveney 082be8ef67 fix port redirection issue 2022-02-11 15:13:31 +01:00
mike12345567 a78dd38a58 Fixing img-src for self host. 2022-02-11 13:23:15 +00:00
Martin McKeaveney 8f668eac85 add csp update for nginx in self host 2022-02-11 13:23:53 +01:00
Martin McKeaveney b2c4b60aff fix for csp for images 2022-02-11 13:22:14 +01:00
Martin McKeaveney 1300216812 fix path in /app for k8s 2022-02-11 13:21:03 +01:00
Martin McKeaveney 580bb89fda Create envoy.yaml 2022-02-11 10:59:06 +01:00
Martin McKeaveney 13a2183616 update helm chart to use nginx 2022-02-01 15:23:11 +01:00
Martin McKeaveney 4fc9b6d535 adding nginx best practices on buffering and body size, gzip 2022-02-01 14:38:58 +01:00
Martin McKeaveney 3d89e14523 adding bbproxy to watchtower 2022-02-01 11:26:36 +01:00
Martin McKeaveney 7fb9b33f6c remove more references to envoy 2022-02-01 11:02:37 +01:00
Martin McKeaveney 56ae2e566e adding proxy to build process 2022-01-31 14:52:44 +01:00
Martin McKeaveney cca6d18af4 point to MinIO instance instead of through proxy 2022-01-30 21:25:56 +01:00
Martin McKeaveney 8fa60b6c72 adding env 2022-01-30 21:20:43 +01:00
Martin McKeaveney 7c4d7e0e8f nginx prod config, security headers and content-security policies 2022-01-30 21:11:59 +01:00
Martin McKeaveney 3544c8ac82 nginx proxy configs 2022-01-14 14:44:40 +01:00
Martin McKeaveney 9d35eea39b working dev setup 2022-01-13 14:27:02 +01:00
Martin McKeaveney 6721b234ac nginx dev setup 2022-01-11 20:33:22 +01:00
Martin McKeaveney 375364784b removing timeouts from app exports in cloud 2021-12-16 18:42:42 +01:00
mike12345567 b489ec1b52 Fixing symlink to env file for development. 2021-12-10 11:04:19 +00:00
Martin McKeaveney 7334fc6748 automate helm deployment with CI 2021-12-09 11:05:43 +00:00
Martin McKeaveney 5a614f33c3 CI Automation for helm chart release 2021-12-08 17:13:00 +00:00
Martin McKeaveney 7ff93e975a completely automate helm chart incrementing and semver 2021-12-08 16:27:33 +00:00
Martin McKeaveney 6f7926015a ensure that dry runs between budibase-infra and standard templates match 2021-12-08 13:19:43 +00:00
Martin McKeaveney 1d0b08905f adding image tag to worker and app services 2021-12-08 08:27:04 +00:00
Martin McKeaveney 8269e85eb9 helm chart release 2021-12-06 18:33:31 +01:00
Martin McKeaveney 5f86321f0b packaging helm chart with consolidated config 2021-12-06 17:19:53 +01:00
Martin McKeaveney eb7468494e adding yarn command for DO build 2021-12-02 14:38:57 +01:00
Martin McKeaveney e003f28e27 completely automate digitalocean release with hashicorp packer 2021-12-01 21:33:38 +01:00
mike12345567 0f0770af32 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-11-25 12:21:58 +00:00
Martin McKeaveney d5a5f4d227 adding version metadata to docker build 2021-11-22 18:25:57 +01:00
mike12345567 94ee13ffc4 Adding the sync call from the worker for creation, updating and deletion of users. Making sure that production and development apps are always up to date with user metadata. 2021-11-04 14:53:03 +00:00
Martin McKeaveney 969d2f5377 add hosting.properties to airgapped build 2021-10-28 18:22:47 +02:00
Martin McKeaveney 7ea05c571b airgapped docker build 2021-10-28 13:29:00 +02:00
Martin McKeaveney 7d5d4e5d36 merge with master 2021-10-26 14:28:49 +02:00
Martin McKeaveney 772550e17a loglevel param in templates 2021-10-20 14:23:46 +01:00
Martin McKeaveney 37b469702f adding log level option 2021-10-20 14:17:47 +01:00
Fabian Kästner c1787d55c5 Make multitenancy configurable in values.yaml, set selfHosted by default. 2021-10-20 14:16:28 +01:00
Fabian Kästner 78fc19d92e minio default 2021-10-20 14:16:12 +01:00
Martin McKeaveney 99f9bae7ee release helm chart 2021-10-20 12:42:21 +01:00
Martin McKeaveney 1cf4b8d849 default MINIO url if available 2021-10-20 12:41:10 +01:00
Andrew Kingston 029b447ce7 Merge pull request #3042 from Budibase/fix/app-export-performance
Improve app export experience
2021-10-20 10:25:59 +01:00
Rory Powell f372d7d7d9 Merge branch 'master' into develop 2021-10-18 16:35:32 +01:00
Martin McKeaveney 1f5751b0fd release latest helm chart 2021-10-18 16:27:14 +01:00
Rory Powell 1cdced5e20 Add SENTRY_DSN to worker 2021-10-18 15:05:55 +01:00
Rory Powell f3b630ed95 Sentry updates 2021-10-18 14:57:30 +01:00
Andrew Kingston c004290718 Increase envoy timeout for API routes to 120s rather than 15s, to match Koa and allw longer connections for downloads 2021-10-18 12:06:09 +01:00
Fabian Kästner ccdc5e7047 Add default value for minio-service URL 2021-10-18 13:02:28 +02:00
Fabian Kästner 5da6a278b6 Make multitenancy configurable in values.yaml, set selfHosted by default. 2021-10-18 12:56:58 +02:00
Rory Powell 83b6713755 Merge pull request #3009 from Budibase/remove-account-url
Remove account url from docker images
2021-10-14 17:33:35 +01:00
Martin McKeaveney e586b47c95 separate sentry projects to avoid noise 2021-10-14 16:22:53 +01:00
Rory Powell 0d20ead4b3 Remove account url from docker images 2021-10-14 15:55:23 +01:00
Martin McKeaveney fcd8ba18df removing quotas that are no longer needed 2021-10-12 22:04:29 +01:00
Martin McKeaveney ca0457dcb4 updated K8S templates with new kit 2021-10-12 21:58:10 +01:00
Rory Powell 7936015cb3 Updates to suport non cloud single and multi tenancy 2021-10-06 14:09:43 +01:00
Rory Powell 2f589a2f42 Add API keys between account portal and budibase 2021-10-04 13:40:50 +01:00
Martin McKeaveney 81e63373c4 update envoy config for k8s 2021-10-01 12:51:33 +01:00
Martin McKeaveney 6d247a3ecb Merge pull request #2782 from panos--/fix/ingress-nginx-repo-url
fix ingress-nginx repo url
2021-09-29 09:49:15 +01:00
Rory Powell 0518bac62e Set cookie domain to fix logout 2021-09-28 16:35:31 +01:00
Andrew Kingston a6e48194f1 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-09-20 10:33:18 +01:00
Thomas Weiß 52db113a51 fix ingress-nginx repo url 2021-09-20 09:37:14 +02:00
Maurits Lourens 518f8fd55e merge develop into branch 2021-09-16 22:15:09 +02:00
Martin McKeaveney b324a26ff5 updating envoy config for kubernetes 2021-09-16 15:35:26 +01:00
Martin McKeaveney b8d10a2b6d merge package updates 2021-08-26 14:13:30 +01:00
Martin McKeaveney a22f4759a7 a more robust docker release process that only tags latest in prod 2021-08-24 17:16:45 +01:00
Martin McKeaveney 4cb057d6ab automate release tag in helm charts, remove superfluous build scripts 2021-08-24 16:58:10 +01:00
Martin McKeaveney b841b41e29 update watchtower port to 6161 2021-08-23 21:48:03 +01:00
Martin McKeaveney 0fb566a3dd allow users to override watchtower port 2021-08-20 09:47:08 +01:00
Martin McKeaveney 27d9aded23 Update README.md 2021-08-19 07:57:30 +01:00
Martin McKeaveney 5843fa0286 test K8S CI 2021-08-18 18:09:40 +01:00
Martin McKeaveney 23e82b9636 remove secret identifier 2021-08-18 11:43:07 +01:00
Martin McKeaveney c1957208a2 add secrets identifier 2021-08-18 11:42:04 +01:00
Martin McKeaveney 26421581eb allow couchDB to be turned off 2021-08-18 10:47:39 +01:00
Martin McKeaveney d355219d7f revert to master images 2021-08-17 22:13:32 +01:00
Martin McKeaveney a81079cafa remove direct config for ingress nginx controller 2021-08-17 22:08:00 +01:00
Martin McKeaveney f992be2b2f remove custom domain by default 2021-08-17 18:03:23 +01:00
Martin McKeaveney 8a90d47e6b adding persistent volumes to couch 2021-08-17 17:40:25 +01:00
Martin McKeaveney 744f8efe8a updating domain values 2021-08-17 17:10:18 +01:00
Martin McKeaveney a4f43dbac1 pushing first budibase helm release 2021-08-17 14:42:12 +01:00
Martin McKeaveney 8168e06b5b remove schema defaults 2021-08-17 11:01:06 +01:00
Martin McKeaveney 1af740fbf7 Helm chart CI automation 2021-08-16 21:47:08 +01:00
Martin McKeaveney ce72624f0f tidy up 2021-08-16 19:00:52 +01:00
Martin McKeaveney 1b78d8349f totally generic templates complete, pending test in different clouds 2021-08-16 19:00:08 +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
mike12345567 a8eb067de3 Merge branch 'fix/apps-2195-2282-2283' of github.com:Budibase/budibase into develop 2021-08-06 17:14:31 +01:00
Martin McKeaveney 4bfccadc77 scarf support 2021-08-06 14:59:39 +01:00
mike12345567 46ea3f3e9e Revert "Merge pull request #2253 from Budibase/revert-2076-feature/multi-tenants"
This reverts commit 4834b765be, reversing
changes made to 2456e69483.
2021-08-05 09:59:08 +01:00
Michael Drury b86a6fddc9 Revert "Multi-tenancy/organisations" 2021-08-04 10:02:24 +01:00
mike12345567 f6d0db4c4b Updating API endpoints, to include the new system one, updating hosting envoy yaml to cover these. 2021-08-02 12:09:03 +01:00
mike12345567 27b2a13817 Swapping admin -> global in worker to reduce confusion in API url naming. 2021-07-22 12:56:47 +01:00
Kyle Harrison 2d451bb3a9 apply fixes for common spelling mistakes 2021-07-09 17:54:49 +01:00
Martin McKeaveney 7617e07649 make app service wait on redis-service so we don't get redis connection errors 2021-06-22 09:46:33 +01:00
Martin McKeaveney 31f086a802 simplify tags 2021-06-21 17:13:16 +01:00
Martin McKeaveney db24af4a55 Merge branch 'develop' of github.com:Budibase/budibase into develop 2021-06-21 16:45:01 +01:00
Martin McKeaveney 8844275357 consolidate build 2021-06-21 16:44:54 +01:00
Martin McKeaveney 1f65427e90 Merge pull request #1732 from Budibase/feature/opinionated-sql
Feature/opinionated sql
2021-06-21 16:28:29 +01:00
Martin McKeaveney 9deeef2d9e add develop tag and update docker push script 2021-06-21 16:25:12 +01:00
Martin McKeaveney 597149228e Merge branch 'master' of github.com:Budibase/budibase into feature/opinionated-sql 2021-06-21 11:14:27 +01:00
Martin McKeaveney 3df9de2a63 use internal port for watchtower to fix updating through budibase UI 2021-06-20 17:36:28 +01:00
Martin McKeaveney a44d59541d merge 2021-06-10 14:15:03 +01:00
mike12345567 5086a4d0c9 Super quick fix for attachments, keeping in correct object store directory. 2021-06-09 17:38:24 +01:00
mike12345567 ae0dbacb31 Merge branch 'master' of github.com:Budibase/budibase into feature/opinionated-sql 2021-06-09 11:03:01 +01:00
mike12345567 8a10d2e5b5 Merge branch 'master' of github.com:Budibase/budibase into feature/opinionated-sql 2021-06-08 12:27:37 +01:00
Martin McKeaveney 7f934327b7 making new screen modal choose the currently filtered role 2021-06-08 11:42:39 +01:00
mike12345567 4e97eea3c0 Fixing staging build so it only occurs on develop, master doesn't need it. 2021-06-07 18:04:16 +01:00