Commit Graph

111 Commits

Author SHA1 Message Date
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
mike12345567 3ccf7f9989 Adding a way to test app URLs in dev. 2021-06-03 19:37:39 +01:00
Martin McKeaveney e927f44c12 removing superfluous controllers 2021-06-01 20:22:56 +01:00
Martin McKeaveney aacaca3d4e update functionality complete 2021-06-01 20:17:06 +01:00
Martin McKeaveney 0c90f9ffc5 adding watchtower to docker config 2021-05-28 10:09:32 +01:00
mike12345567 0a4c4f1cc0 Adding some changes for to redis library, allowing reconnection. 2021-05-24 14:54:47 +01:00
mike12345567 06353409bc Making sure the email sends out the write port if no platform URL is set. 2021-05-21 14:38:46 +01:00
Martin McKeaveney 7a73a39d33 fixes for production envoy config 2021-05-20 21:06:08 +01:00
Martin McKeaveney 3a422be071 simplify docker build before push 2021-05-20 13:54:18 +01:00
Martin McKeaveney f6f32b98ba testing CI pipeline 2021-05-20 12:46:31 +01:00
Martin McKeaveney bb560f7e22 Merge branch 'fix/onboarding' of https://github.com/Budibase/budibase into fix/onboarding 2021-05-20 12:38:18 +01:00
Martin McKeaveney bb9d209a36 pipeline work 2021-05-20 12:38:12 +01:00
mike12345567 148cf87224 Cleanup after testing/looking through hosting files. 2021-05-20 12:21:58 +01:00
mike12345567 8e1f18e456 Changing INTERNAL_KEY to INTERNAL_API_KEY. 2021-05-11 15:23:03 +01:00
mike12345567 0aabcf5a47 Merge branch 'smtp-configuration' of github.com:Budibase/budibase into smtp-configuration 2021-05-11 15:09:22 +01:00
mike12345567 92cc0bc7cd Updating to support SMTP email automation action, as well as some general work around from and subject which previously we'ren't fully implemented. 2021-05-11 15:08:59 +01:00
mike12345567 502ae91aae Formatting. 2021-05-10 13:19:09 +01:00
mike12345567 77b4b206f7 Other minor fixes after doing some initial setup testing. 2021-05-10 13:18:05 +01:00
mike12345567 4e3bc326b4 Updating with a tested and functional API for uploading files for configs. 2021-05-07 13:55:30 +01:00
Andrew Kingston be04060ff1 Server builder under /builder rather than /app for top level to avoid confusion 2021-05-07 08:17:21 +01:00
Andrew Kingston f6f2e3f63a Merge branch 'app-list' of github.com:Budibase/budibase into app-list 2021-05-06 17:21:06 +01:00
Andrew Kingston 17ac2a402f Make envoy proxy app with and without trailing slash 2021-05-06 17:20:11 +01:00
mike12345567 b3b1f00b22 Re-ordering dev envoy file. 2021-05-06 17:03:34 +01:00
mike12345567 c032022fa8 Updating envoy configuration to allow pass through to minio again. 2021-05-06 16:38:18 +01:00
mike12345567 82687bad26 Merge branch 'next' of github.com:Budibase/budibase into feature/password-reset 2021-05-05 18:00:22 +01:00
Keviin Åberg Kultalahti df30e594df allow navigation to other URLs than /builder 2021-05-05 11:22:39 +02:00
mike12345567 1cf778845a Fixing issues with Redis/Bull and the integration with new redis module. 2021-05-04 18:13:44 +01:00
mike12345567 08c158c121 Adding a redis client to the auth system, as part of work towards the reset password flow. 2021-04-27 17:29:05 +01:00
Martin McKeaveney 468b9b97f9 builder login 2021-04-12 10:47:48 +01:00
Martin McKeaveney 98576f586e login page 2021-04-11 11:35:55 +01:00
mike12345567 15900efc35 Some changes after trying system for first time. 2021-04-08 17:39:46 +01:00
mike12345567 8cde219db9 First pass of global user configuration through existing user API with role mappings. 2021-04-08 16:58:33 +01:00