Commit Graph

252 Commits

Author SHA1 Message Date
mike12345567 f69469ea4f Adding the ability to run the monorepo in cloud mode without the connected account portal (login, org setting and admin creation are all available again) as well as re-working how the redirects work to massively reduce the chance of cycles which I was experiencing constantly. 2021-09-29 16:55:59 +01:00
mike12345567 a0f69251c8 Adding the ability to run the monorepo in cloud mode without the connected account portal (login, org setting and admin creation are all available again) as well as re-working how the redirects work to massively reduce the chance of cycles which I was experiencing constantly. 2021-09-29 16:55:59 +01:00
mike12345567 4de566d864 Some fixes after testing and adding some basic work to the frontend. 2021-09-28 18:05:52 +01:00
mike12345567 d282cd030f Some fixes after testing and adding some basic work to the frontend. 2021-09-28 18:05:52 +01:00
mike12345567 1f474ca106 Minimal fix for issue involving JSON views and newlines with postgres, this fix couldn't be more over-arching as it risked breaking new lines across the board. Have included a script for setting up the test scenario as well. This fixes issue #2612. 2021-09-24 18:10:30 +01:00
mike12345567 32bdc4a991 Minimal fix for issue involving JSON views and newlines with postgres, this fix couldn't be more over-arching as it risked breaking new lines across the board. Have included a script for setting up the test scenario as well. This fixes issue #2612. 2021-09-24 18:10:30 +01:00
mike12345567 1952dc308e Fixes issue #2616 - this is a slightly complex fix and handles a few other issues with mysql (around returning on creation of a row and relationships) - a new mechanism is now used for pagination and limiting which makes sure the limits are applied to the outer table rather than the combination of the outer and the joined. 2021-09-23 16:35:09 +01:00
mike12345567 67212e5c5b Fixes issue #2616 - this is a slightly complex fix and handles a few other issues with mysql (around returning on creation of a row and relationships) - a new mechanism is now used for pagination and limiting which makes sure the limits are applied to the outer table rather than the combination of the outer and the joined. 2021-09-23 16:35:09 +01:00
mike12345567 f70cee3c52 Fixing issue #2673 - discovered issues with some column types not being worked out to be auto-columns in postgres. 2021-09-22 17:46:54 +01:00
mike12345567 e92b0e0c94 Fixing issue #2673 - discovered issues with some column types not being worked out to be auto-columns in postgres. 2021-09-22 17:46:54 +01:00
Rory Powell 4215f1b919 fix tests 2021-09-20 12:58:58 +01:00
Rory Powell 00e2b50f26 fix tests 2021-09-20 12:58:58 +01:00
Rory Powell b7c867e250 Add self host enable/disable scripts 2021-09-14 12:21:16 +01:00
Rory Powell 62e93d2302 Add self host enable/disable scripts 2021-09-14 12:21:16 +01:00
Martin McKeaveney c66f5ab6ff couchDB auth options 2021-08-17 14:11:03 +01:00
Martin McKeaveney f4232bd7d7 couchDB auth options 2021-08-17 14:11:03 +01:00
mike12345567 88396b77ed Merge branch 'fix/apps-2195-2282-2283' of github.com:Budibase/budibase into develop 2021-08-06 17:14:31 +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
mike12345567 c4f8d17a6e 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
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
mike12345567 42f08f97cc Revert "Merge pull request #2253 from Budibase/revert-2076-feature/multi-tenants"
This reverts commit 0d2e2314d4, reversing
changes made to 1beca4ee96.
2021-08-05 09:59:08 +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
Martin McKeaveney d9ad54d939 merge with master 2021-08-04 13:20:11 +01:00
Martin McKeaveney df927e3feb merge with master 2021-08-04 13:20:11 +01:00
Michael Drury 655bfe1a0c
Merge branch 'develop' into feature/multi-tenants 2021-08-04 10:07:31 +01:00
Michael Drury ec26f6ab5e Merge branch 'develop' into feature/multi-tenants 2021-08-04 10:07:31 +01:00
Michael Drury f37946d47e
Revert "Multi-tenancy/organisations" 2021-08-04 10:02:24 +01:00
Michael Drury b86a6fddc9 Revert "Multi-tenancy/organisations" 2021-08-04 10:02:24 +01:00
Rory Powell 25a737ac74 Add watchtower hooks 2021-07-29 20:32:18 +01:00
Rory Powell 648661877a Add watchtower hooks 2021-07-29 20:32:18 +01:00
mike12345567 1df08ffe35 Fixing some issues with org not being correctly detected. 2021-07-27 15:35:26 +01:00
mike12345567 615053f201 Fixing some issues with org not being correctly detected. 2021-07-27 15:35:26 +01:00
mike12345567 2f225a4448 Adding ability to disable/enable multi-tenancy flags easily. 2021-07-26 16:17:56 +01:00
mike12345567 219962cb8a Adding ability to disable/enable multi-tenancy flags easily. 2021-07-26 16:17:56 +01:00
mike12345567 5c58630ed7 Fixing up everything found when testing with Cypress. 2021-07-26 13:19:47 +01:00
mike12345567 4606248ffd Fixing up everything found when testing with Cypress. 2021-07-26 13:19:47 +01:00
mike12345567 a384cc059d Changing how apps are retrieved to be more efficient. 2021-07-23 20:01:53 +01:00
mike12345567 4d0faa38e3 Changing how apps are retrieved to be more efficient. 2021-07-23 20:01:53 +01:00
mike12345567 0473c295d3 Changing how flags are handled. 2021-07-22 16:36:21 +01:00
mike12345567 1d6a350311 Changing how flags are handled. 2021-07-22 16:36:21 +01:00
mike12345567 c6d80e2265 Adding float type to MySQL. 2021-07-12 11:10:11 +01:00
mike12345567 7aca56f019 Adding float type to MySQL. 2021-07-12 11:10:11 +01:00
mike12345567 dc32c90aaa Fixing some issues discovered with the new SQL connectors were the input type would always be string (causing some SQL types to break) - parsing these before input to attempt to fix this problem - issue referenced in #1943. 2021-07-12 10:51:30 +01:00
mike12345567 184df6c685 Fixing some issues discovered with the new SQL connectors were the input type would always be string (causing some SQL types to break) - parsing these before input to attempt to fix this problem - issue referenced in #1943. 2021-07-12 10:51:30 +01:00
mike12345567 4e4b8f244e Giving the system the ability to make auto increment columns auto-columns in postgres or mysql. 2021-07-05 18:11:23 +01:00
mike12345567 8550d00751 Giving the system the ability to make auto increment columns auto-columns in postgres or mysql. 2021-07-05 18:11:23 +01:00
mike12345567 13100a69ba Implementing all return possibilities, now to implement creation. 2021-06-29 17:42:46 +01:00
mike12345567 98b7bff678 Implementing all return possibilities, now to implement creation. 2021-06-29 17:42:46 +01:00
mike12345567 4a7e2ffa4f Creating a many-to-many database scenario and seeding with data. 2021-06-28 12:36:05 +01:00
mike12345567 10cf55e273 Creating a many-to-many database scenario and seeding with data. 2021-06-28 12:36:05 +01:00
mike12345567 d90f77fa42 Speeding up server tests and removing the ability for it to port collide. 2021-06-25 16:14:06 +01:00
mike12345567 f0e7b9b25e Speeding up server tests and removing the ability for it to port collide. 2021-06-25 16:14:06 +01:00
mike12345567 efe1866dbe Fixing an issue I found with postgres schema generator, it was applying all primary keys to all tables. 2021-06-23 12:44:54 +01:00
mike12345567 b3f3826aa6 Fixing an issue I found with postgres schema generator, it was applying all primary keys to all tables. 2021-06-23 12:44:54 +01:00
mike12345567 9b8ad3972e Adding script for creating basic postgres setup. 2021-06-18 15:03:22 +01:00
mike12345567 9cc93b62a7 Adding script for creating basic postgres setup. 2021-06-18 15:03:22 +01:00
mike12345567 7065bf1ea9 Adding a mySQL plus integration, as well as fixing some issues with running queries directly. 2021-06-18 12:29:25 +01:00
mike12345567 21b591954f Adding a mySQL plus integration, as well as fixing some issues with running queries directly. 2021-06-18 12:29:25 +01:00
mike12345567 449b534db4 Updating export template script to remove users as well. 2021-06-08 18:09:09 +01:00
mike12345567 033258b495 Updating export template script to remove users as well. 2021-06-08 18:09:09 +01:00
Martin McKeaveney 0ed0550e73 revert functionality working 2021-05-16 21:25:37 +01:00
Martin McKeaveney 0f2bcf581d revert functionality working 2021-05-16 21:25:37 +01:00
mike12345567 2ea05c44b4 Changing INTERNAL_KEY to INTERNAL_API_KEY. 2021-05-11 15:23:03 +01:00
mike12345567 8e1f18e456 Changing INTERNAL_KEY to INTERNAL_API_KEY. 2021-05-11 15:23:03 +01:00
mike12345567 7d78d7b15a Some updates, working towards supporting automation send smtp email also removing the styling template, adding to base. 2021-05-11 12:02:29 +01:00
mike12345567 7736869148 Some updates, working towards supporting automation send smtp email also removing the styling template, adding to base. 2021-05-11 12:02:29 +01:00
mike12345567 66341473ca Fixing issues with Redis/Bull and the integration with new redis module. 2021-05-04 18:13:44 +01:00
mike12345567 1cf778845a Fixing issues with Redis/Bull and the integration with new redis module. 2021-05-04 18:13:44 +01:00
Martin McKeaveney a4cc4191b4 merge with next 2021-05-04 11:40:59 +01:00
Martin McKeaveney 8ecb70a8f7 merge with next 2021-05-04 11:40:59 +01:00
Andrew Kingston 556236ebce Add explicit prettier options 2021-05-04 11:32:22 +01:00
Andrew Kingston 797e8a8b67 Add explicit prettier options 2021-05-04 11:32:22 +01:00
Martin McKeaveney 4618dfd2d1 merge 2021-05-04 09:55:14 +01:00
Martin McKeaveney 72ed644803 merge 2021-05-04 09:55:14 +01:00
Keviin Åberg Kultalahti 4ec2e7d01f lint:fix 2021-05-03 09:31:09 +02:00
Keviin Åberg Kultalahti 0afbf1649e lint:fix 2021-05-03 09:31:09 +02:00
Martin McKeaveney da25d8b6e5 tidy up 2021-04-30 15:44:37 +01:00
Martin McKeaveney 6d32d5f8b1 tidy up 2021-04-30 15:44:37 +01:00
Martin McKeaveney b4051dfed6 merge with next 2021-04-29 11:45:47 +01:00
Martin McKeaveney b876e91ae6 merge with next 2021-04-29 11:45:47 +01:00
mike12345567 5cf3740fea Making sure volumes are removed when nuking. 2021-04-08 18:18:53 +01:00
mike12345567 0c34f1a108 Making sure volumes are removed when nuking. 2021-04-08 18:18:53 +01:00
mike12345567 13c368109e Some changes after trying system for first time. 2021-04-08 17:39:46 +01:00
mike12345567 15900efc35 Some changes after trying system for first time. 2021-04-08 17:39:46 +01:00
mike12345567 0f49868de8 Updating to make sure the envoy generated dev file is very obviously not to be edited. 2021-04-07 17:52:22 +01:00
mike12345567 16b5b19027 Updating to make sure the envoy generated dev file is very obviously not to be edited. 2021-04-07 17:52:22 +01:00
mike12345567 482525187d Attempting to use HBS to re-create the envoy file as needed in dev. 2021-04-07 17:13:19 +01:00
mike12345567 6c790206a8 Attempting to use HBS to re-create the envoy file as needed in dev. 2021-04-07 17:13:19 +01:00
Martin McKeaveney 33fe760959 scripting block 2021-03-26 14:56:34 +00:00
Martin McKeaveney 8f5fd32f74 scripting block 2021-03-26 14:56:34 +00:00
mike12345567 321d3cbd5d Some further work to make sure all use of the budibaseAppsDir is removed in important places. 2021-03-25 18:03:58 +00:00
mike12345567 b70ff24dac Some further work to make sure all use of the budibaseAppsDir is removed in important places. 2021-03-25 18:03:58 +00:00
Martin McKeaveney f4c7455936 merge 2021-03-24 20:44:52 +00:00
Martin McKeaveney 4d141d8ba8 merge 2021-03-24 20:44:52 +00:00
mike12345567 73cf53d149 Getting rid of the CLOUD environment variable, this makes no sense anymore, now there is isDev() and isProd() which will work out the current state of the cluster. 2021-03-24 18:21:23 +00:00
mike12345567 d66af9f151 Getting rid of the CLOUD environment variable, this makes no sense anymore, now there is isDev() and isProd() which will work out the current state of the cluster. 2021-03-24 18:21:23 +00:00
mike12345567 d7497aa989 Some changes to how environment is loaded to make the init process by default flesh out some good settings. 2021-03-23 15:37:11 +00:00
mike12345567 00344b3b39 Some changes to how environment is loaded to make the init process by default flesh out some good settings. 2021-03-23 15:37:11 +00:00
Martin McKeaveney afaa706e07 simplify try catch in manage script 2021-03-23 11:01:33 +00:00
Martin McKeaveney 90228e3334 simplify try catch in manage script 2021-03-23 11:01:33 +00:00
Martin McKeaveney 555e6386a7 better wording and tidy up of init script 2021-03-22 19:35:29 +00:00
Martin McKeaveney 81452c3a7f better wording and tidy up of init script 2021-03-22 19:35:29 +00:00
mike12345567 35e3999b05 Merge branch 'single-stack-dev' of github.com:Budibase/budibase into feature/fs-removal 2021-03-22 17:20:07 +00:00
mike12345567 78eb00b39d Merge branch 'single-stack-dev' of github.com:Budibase/budibase into feature/fs-removal 2021-03-22 17:20:07 +00:00
Martin McKeaveney 50b0759642 tidy up 2021-03-22 17:15:34 +00:00
Martin McKeaveney cb4ed1cdb4 tidy up 2021-03-22 17:15:34 +00:00
Martin McKeaveney 9e28ddf3c1 single stack dev setup complete 2021-03-22 17:05:00 +00:00
Martin McKeaveney f3302770b3 single stack dev setup complete 2021-03-22 17:05:00 +00:00
Martin McKeaveney 2852a739a4 basic single stack dev setup 2021-03-22 15:43:26 +00:00
Martin McKeaveney 6742c3ca99 basic single stack dev setup 2021-03-22 15:43:26 +00:00
mike12345567 95ee615006 Work in progress, have refactored the templating system to remove local templates, application and template system now work through minio with no file access. 2021-03-19 19:07:47 +00:00
mike12345567 c49637db47 Work in progress, have refactored the templating system to remove local templates, application and template system now work through minio with no file access. 2021-03-19 19:07:47 +00:00
Martin McKeaveney 70e4b2514e merge 2021-01-11 20:29:33 +00:00
Martin McKeaveney a48869a2f0 merge 2021-01-11 20:29:33 +00:00
Martin McKeaveney 5aa7edda64 use dynamic input in query 2021-01-11 15:34:43 +00:00
Martin McKeaveney b76d42bcde use dynamic input in query 2021-01-11 15:34:43 +00:00
mike12345567 f2c37c7179 Initial work, layout out some work which will eventually become docker compose, just using bash scripts for now. 2020-11-30 18:04:47 +00:00
mike12345567 ac6b2aa6c8 Initial work, layout out some work which will eventually become docker compose, just using bash scripts for now. 2020-11-30 18:04:47 +00:00
mike12345567 667052e0b4 Updating templates to be able to run locally with an environment variable LOCAL_TEMPLATES and making them work using the DB. Users are also no longer included in the db dump. 2020-11-06 12:30:30 +00:00
mike12345567 e353c2a1c4 Updating templates to be able to run locally with an environment variable LOCAL_TEMPLATES and making them work using the DB. Users are also no longer included in the db dump. 2020-11-06 12:30:30 +00:00
mike12345567 91d9e4d41e Updating script that had duplicate key. 2020-10-29 10:53:39 +00:00
mike12345567 1238147be9 Updating script that had duplicate key. 2020-10-29 10:53:39 +00:00
mike12345567 d587bad363 Renaming instanceId -> appId to reduce confusion through the system, there only is one ID now. 2020-10-29 10:28:27 +00:00
mike12345567 5b2be03bc3 Renaming instanceId -> appId to reduce confusion through the system, there only is one ID now. 2020-10-29 10:28:27 +00:00
Michael Drury 0d78dd0cf5 `:wMerge branch 'bug/add-init' of github.com:Budibase/budibase into feature/remove-multitenancy 2020-10-28 22:18:05 +00:00
Michael Drury 91d9f44aeb `:wMerge branch 'bug/add-init' of github.com:Budibase/budibase into feature/remove-multitenancy 2020-10-28 22:18:05 +00:00
Michael Drury dcc9cfb4bd The removal of CLI package meant there was no way to init the system anymore so nuking budibase directory was unrecoverable, fixing this. 2020-10-28 22:14:13 +00:00
Michael Drury fa00b6662d The removal of CLI package meant there was no way to init the system anymore so nuking budibase directory was unrecoverable, fixing this. 2020-10-28 22:14:13 +00:00
mike12345567 d79be3c854 Initial work into multi-tenancy removal, experiencing issues with test cases at this point. 2020-10-28 20:35:06 +00:00
mike12345567 ea03d099b3 Initial work into multi-tenancy removal, experiencing issues with test cases at this point. 2020-10-28 20:35:06 +00:00
mike12345567 d90c1e3dd3 Changing record -> row in this update, completing the update of renaming in the builder, this release needs further testing. 2020-10-09 19:10:28 +01:00
mike12345567 5d49d529e3 Changing record -> row in this update, completing the update of renaming in the builder, this release needs further testing. 2020-10-09 19:10:28 +01:00
mike12345567 b400a06027 Updates for API usage after testing against local Dynamo. 2020-10-08 17:34:41 +01:00
mike12345567 552c31a53e Updates for API usage after testing against local Dynamo. 2020-10-08 17:34:41 +01:00
Martin McKeaveney e7c3afb7f1 CLI tool for exporting apps, tidy up 2020-09-29 10:32:42 +01:00
Martin McKeaveney 6a2da91f31 CLI tool for exporting apps, tidy up 2020-09-29 10:32:42 +01:00
Martin McKeaveney c2321797f1 async templates working from S3 2020-09-28 17:04:08 +01:00
Martin McKeaveney b27f80071f async templates working from S3 2020-09-28 17:04:08 +01:00
Martin McKeaveney db2d9af545 template export v1 2020-09-25 14:47:42 +01:00
Martin McKeaveney 892ce699ce template export v1 2020-09-25 14:47:42 +01:00
Michael Shanks d11dd74f40 dev script to replicate local dev db to remote couchDb, by appname 2020-07-17 17:02:27 +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 48d60a7183 removed ADMIN_SECRET env var (no longer needed) 2020-06-21 20:54:37 +01:00
Michael Shanks bf89f3c403 removed ADMIN_SECRET env var (no longer needed) 2020-06-21 20:54:37 +01:00
Michael Shanks 0f1a472b6f configurable logLevel - defaults to error 2020-05-29 14:06:25 +01:00
Michael Shanks cd9f539a09 configurable logLevel - defaults to error 2020-05-29 14:06:25 +01:00
Martin McKeaveney b0644b2234 lint 2020-05-18 15:46:38 +01:00
Martin McKeaveney 7f0f8f2d9f lint 2020-05-18 15:46:38 +01:00
Martin McKeaveney 1139627bf5 pino logging, electron fixes, running integration tests in band 2020-05-18 15:33:29 +01:00
Martin McKeaveney 56c492c66d pino logging, electron fixes, running integration tests in band 2020-05-18 15:33:29 +01:00