Commit Graph

250 Commits

Author SHA1 Message Date
mike12345567 60de9ccb28 Fixing issue with 1:N relationships and multiple fields, issue #1753. 2021-06-20 10:53:55 +01:00
Andrew Kingston cb56d7464b
Merge pull request #1712 from Budibase/fix/eslint-prettier
Fix eslint, update eslint and prettier versions and update package scripts
2021-06-16 09:22:07 +01:00
Andrew Kingston abb1d33948 Lint with prettier 2021-06-15 19:39:40 +01:00
mike12345567 386c8890a5 Adding longer timeout for real email tests. 2021-06-15 13:22:38 +01:00
mike12345567 db393f05be Adding options to SMTP form for configuring TLS/STARTTLS. 2021-06-10 11:25:06 +01:00
mike12345567 eb3222a0bc Updating SMTP config to show better errors. 2021-06-09 15:45:54 +01:00
Michael Drury 7bd07031e4 Linting. 2021-06-08 18:29:34 +01:00
mike12345567 8cffe5c9ff Fixing a collection of issues, specifically users being exported/imported and issues with database import causing weirdness (metadata doc being wrong). 2021-06-08 18:06:16 +01:00
mike12345567 ef057910e1 Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-06-07 13:22:27 +01:00
mike12345567 132f084ca5 Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-06-02 10:08:57 +01:00
Martin McKeaveney 0166c48d40 removing superfluous controllers 2021-06-01 20:22:56 +01:00
Martin McKeaveney fe65313eed update functionality complete 2021-06-01 20:17:06 +01:00
Martin McKeaveney 7a0bbfdb84 Merge branch 'master' of https://github.com/Budibase/budibase into lab-day-2705 2021-06-01 19:24:24 +01:00
mike12345567 2057985631 Fixing issue with roles not being added correctly to global users and cleaning up roles when an app is deleted. 2021-06-01 15:58:40 +01:00
Martin McKeaveney a453f6cac2 adding watchtower to docker config 2021-05-28 10:09:32 +01:00
mike12345567 be7736afb7 Fixing app cypress test cases. 2021-05-25 13:25:42 +01:00
mike12345567 39545358f2 Fixing the creation of user in cypress. 2021-05-25 11:06:50 +01:00
mike12345567 d89c750761 Updating system to allow setting builder/admin as a toggle during the invitation phase of a user. 2021-05-24 18:45:43 +01:00
mike12345567 2abe543cb1 Linting and fixing an issue with the dev pass through. 2021-05-24 16:20:02 +01:00
mike12345567 428a9e5ba3 Formatting. 2021-05-24 14:56:23 +01:00
mike12345567 292d520b30 Adding some changes for to redis library, allowing reconnection. 2021-05-24 14:54:47 +01:00
mike12345567 a39b633c90 Formatting and adding routing checks to push the user out of admin menus when they are not an admin. 2021-05-21 17:12:25 +01:00
mike12345567 3c650fad56 Merge branch 'master' of github.com:Budibase/budibase into fix/lockdown-admin 2021-05-21 16:54:52 +01:00
mike12345567 18cbb02bf9 Updating administration middleware so that internal requests allowed through automatically. 2021-05-21 16:43:01 +01:00
Michael Drury 8ee874055e
Merge pull request #1537 from Budibase/feature/app-updated-at
Mike fixes + application updated at timestamps
2021-05-21 16:10:29 +01:00
mike12345567 2da319e960 Merge branch 'master' of github.com:Budibase/budibase into feature/app-updated-at 2021-05-21 14:57:41 +01:00
mike12345567 b71d751243 Making sure roles object is always present, issue #1529. 2021-05-21 14:56:06 +01:00
Martin McKeaveney 2636c9450b simpler check using checklist 2021-05-21 14:55:11 +01:00
mike12345567 3b81989250 Making sure the email sends out the write port if no platform URL is set. 2021-05-21 14:38:46 +01:00
Keviin Åberg Kultalahti 093e52a4b7 Merge branch 'master' into fixes/user-management 2021-05-21 13:32:55 +02:00
Michael Drury 34384e476c
Merge pull request #1514 from Budibase/fix/per-app-login
Removing per app login screens
2021-05-21 11:11:21 +01:00
Keviin Åberg Kultalahti 3593073c00 change forceReset bool name 2021-05-21 12:10:02 +02:00
Martin McKeaveney fe5df57935 removing skip_setup as it was preventing init 2021-05-20 21:42:27 +01:00
mike12345567 a8ab7858b7 Formatting. 2021-05-20 20:48:46 +01:00
mike12345567 fba63134d1 Fixing some issues found when testing. 2021-05-20 20:48:24 +01:00
Keviin Åberg Kultalahti 81726501ee Merge branch 'next' into fixes/user-management 2021-05-20 11:02:15 +02:00
mike12345567 584f7c2403 Fixing worker test cases. 2021-05-19 16:39:17 +01:00
mike12345567 8c68f1c134 Fixing issues with the user table within the apps. 2021-05-19 15:55:00 +01:00
mike12345567 6d6eee2a93 Adding the ability to get all apps, with the status attached. 2021-05-19 15:09:57 +01:00
mike12345567 af531241c4 Adding a get self endpoint in the global users. 2021-05-19 13:37:59 +01:00
mike12345567 31d3566626 Allowing null for global user endpoint properties. 2021-05-19 13:30:55 +01:00
mike12345567 14b62b8aed Removing admin middleware applying to everything. 2021-05-19 13:22:05 +01:00
mike12345567 8e10b42f9c Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:18:38 +01:00
mike12345567 1956d9765e Adding admin only endpoint, removing the ability to create/delete global users from the app server and adding a global self user update. 2021-05-19 13:17:50 +01:00
Keviin Åberg Kultalahti 06af8e70e6 add forcePasswordReset bool to user object validation 2021-05-19 13:24:14 +02:00
mike12345567 298e5c7e4d Updating reset link to match that of the builder. 2021-05-18 15:48:28 +01:00
mike12345567 d9439abe86 Building up the API interactions for the forgotten password flow. 2021-05-18 15:26:09 +01:00
Keviin Åberg Kultalahti e838950777 Merge branch 'next' into admin/user-management-ui 2021-05-18 12:27:46 +02:00
Keviin Åberg Kultalahti a3f5e1af8c lint:fix 2021-05-18 12:21:57 +02:00
Keviin Åberg Kultalahti 7fa0666cae updates invite url 2021-05-18 12:18:06 +02:00
Martin McKeaveney d5fb542589 lint 2021-05-17 21:43:50 +01:00
Keviin Åberg Kultalahti 71929dadd1 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 16:41:46 +02:00
mike12345567 eb4a430a7c Updating templating bindings enumerations. 2021-05-17 15:30:24 +01:00
Keviin Åberg Kultalahti 447a592ddb Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:53:32 +02:00
mike12345567 df7828d3af don't use the _id prop of the app metadata. 2021-05-17 14:52:49 +01:00
Keviin Åberg Kultalahti b8870ed8c4 erge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:29:33 +02:00
mike12345567 cbc2066d91 Updating roles API further so find API works too. 2021-05-17 14:28:41 +01:00
mike12345567 19b1310c60 Merge branch 'feature/draft-apps' of github.com:Budibase/budibase into feature/draft-apps 2021-05-17 14:24:36 +01:00
Keviin Åberg Kultalahti 5a7ac2287b Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:21:48 +02:00
mike12345567 dd4a963c3e Updating role system to never think about the dev app. 2021-05-17 14:20:19 +01:00
Martin McKeaveney 6dc288fcc3 merge 2021-05-16 21:29:07 +01:00
Martin McKeaveney 0ed0550e73 revert functionality working 2021-05-16 21:25:37 +01:00
Keviin Åberg Kultalahti 771467fba1 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-14 17:49:09 +02:00
mike12345567 0234d11110 Making sure routes are included. 2021-05-14 16:47:47 +01:00
mike12345567 ac0f620b38 Formatting. 2021-05-14 16:32:51 +01:00
Keviin Åberg Kultalahti 8392a4ba38 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-14 17:32:08 +02:00
mike12345567 c45fdefb48 Adding administration roles API. 2021-05-14 16:31:07 +01:00
mike12345567 2d0122f7d6 A general re-work of some parts of the auth lib, as well as moving roles/permissions around to make it possible to build an admin API which has role knowledge. 2021-05-14 15:43:41 +01:00
mike12345567 d7dc133e43 Updating valid to optionals. 2021-05-12 15:44:16 +01:00
mike12345567 86f7e76180 Merge branch 'admin/user-management-ui' of github.com:Budibase/budibase into admin/user-management-ui 2021-05-12 14:27:48 +01:00
mike12345567 b58ed6dd4b Fixing an issue with the upload URL not being inserted in correct location. 2021-05-12 14:27:33 +01:00
mike12345567 8f7a3f4d69 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 13:59:59 +01:00
Keviin Åberg Kultalahti 0da5247a03 Merge branch 'next' into admin/user-management-ui 2021-05-12 14:08:58 +02:00
mike12345567 fed94bea70 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 12:49:42 +01:00
Martin McKeaveney 56d117c819 fixes from PR 2021-05-12 12:38:49 +01:00
mike12345567 c9d903a92f General cleanup, doing away with the concept of hosting in the builder and the generally confusing difference between cloud, self hosting and running locally - server is simply always a server now. 2021-05-11 17:49:26 +01:00
mike12345567 5230dcd3ac Formatting. 2021-05-11 15:24:17 +01:00
mike12345567 2ea05c44b4 Changing INTERNAL_KEY to INTERNAL_API_KEY. 2021-05-11 15:23:03 +01:00
mike12345567 147d67cd26 Merge branch 'smtp-configuration' of github.com:Budibase/budibase into smtp-configuration 2021-05-11 15:09:22 +01:00
mike12345567 8faa9554ed 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
Martin McKeaveney c8b1adb135 merge 2021-05-11 14:58:55 +01:00
Martin McKeaveney 3bf3fc5e02 email template E2E, adding preview 2021-05-11 14:44:43 +01:00
mike12345567 638e2f5c8e Merge branch 'admin/user-management-ui' of github.com:Budibase/budibase into admin/user-management-ui 2021-05-11 12:51:25 +01:00
mike12345567 ec751b59a4 Fixing an issue with platformUrl being required in settings. 2021-05-11 12:51:14 +01:00
mike12345567 339554b163 Adding link to the real email test. 2021-05-11 12:04:07 +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 85030491b2 Renaming registration to invite URL. 2021-05-10 15:05:06 +01:00
Martin McKeaveney b415fb2089 pull template type from body instead of params 2021-05-10 14:41:52 +01:00
mike12345567 2081dd96e0 Making sure relative logo URL is converted to a full path in templates. 2021-05-07 14:30:37 +01:00
mike12345567 902119c39c Updating with a tested and functional API for uploading files for configs. 2021-05-07 13:55:30 +01:00
Martin McKeaveney cb2b1037ba SMTP and template management E2E 2021-05-06 18:02:44 +01:00
Martin McKeaveney 361db5e96f update scoped config imports 2021-05-06 12:09:35 +01:00
Martin McKeaveney 23cb160a69 merge with next 2021-05-06 11:56:53 +01:00
Martin McKeaveney 2fe2d521cf lint 2021-05-06 10:57:24 +01:00
Martin McKeaveney efacbe861a unit tests 2021-05-06 10:54:01 +01:00
mike12345567 02a270a24d Making some changes to how configs are scoped. 2021-05-06 10:51:21 +01:00
Martin McKeaveney 399c463f52 do not allow users to initialise again once an admin has been created 2021-05-05 22:06:31 +01:00
Martin McKeaveney 1aedba80bd first time setup E2E 2021-05-05 21:56:43 +01:00
Martin McKeaveney 4bc1a7dc3c renable worker protection 2021-05-05 20:59:16 +01:00
Martin McKeaveney 4377b41f40 endpoint for budibase configuration checklist 2021-05-05 20:58:31 +01:00