Commit Graph

215 Commits

Author SHA1 Message Date
mike12345567 0b924908fd Formatting. 2021-05-20 20:48:46 +01:00
mike12345567 4d6e4475d3 Fixing some issues found when testing. 2021-05-20 20:48:24 +01:00
Martin McKeaveney 7ab24fed2b merge with master 2021-05-20 10:40:15 +01:00
mike12345567 12bbe19ed0 Fixing worker test cases. 2021-05-19 16:39:17 +01:00
mike12345567 c6f7f115b5 Fixing issues with the user table within the apps. 2021-05-19 15:55:00 +01:00
mike12345567 0bbd45b413 Adding the ability to get all apps, with the status attached. 2021-05-19 15:09:57 +01:00
mike12345567 91ed6679c4 Adding a get self endpoint in the global users. 2021-05-19 13:37:59 +01:00
mike12345567 5e7ca07af7 Allowing null for global user endpoint properties. 2021-05-19 13:30:55 +01:00
mike12345567 c2cd365e76 Removing admin middleware applying to everything. 2021-05-19 13:22:05 +01:00
mike12345567 db3497c83a Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:18:38 +01:00
mike12345567 f08b894e55 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
mike12345567 14cd1744ff Updating reset link to match that of the builder. 2021-05-18 15:48:28 +01:00
mike12345567 e9b9ada128 Building up the API interactions for the forgotten password flow. 2021-05-18 15:26:09 +01:00
Keviin Åberg Kultalahti 39d5e4ef45 Merge branch 'next' into admin/user-management-ui 2021-05-18 12:27:46 +02:00
Keviin Åberg Kultalahti 9f5e891b72 lint:fix 2021-05-18 12:21:57 +02:00
Keviin Åberg Kultalahti 7c3e7ab7aa updates invite url 2021-05-18 12:18:06 +02:00
Martin McKeaveney ee9a097979 lint 2021-05-17 21:43:50 +01:00
Keviin Åberg Kultalahti 9eaabda8a5 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 16:41:46 +02:00
mike12345567 cf056ade04 Updating templating bindings enumerations. 2021-05-17 15:30:24 +01:00
Keviin Åberg Kultalahti 7082a1aaa2 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:53:32 +02:00
mike12345567 30f6238d45 don't use the _id prop of the app metadata. 2021-05-17 14:52:49 +01:00
Keviin Åberg Kultalahti 7fa617a543 erge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:29:33 +02:00
mike12345567 e51afc7451 Updating roles API further so find API works too. 2021-05-17 14:28:41 +01:00
mike12345567 17504443df 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 56e09c9b7b Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:21:48 +02:00
mike12345567 277ceb3ad1 Updating role system to never think about the dev app. 2021-05-17 14:20:19 +01:00
Martin McKeaveney fc7ddbe540 merge 2021-05-16 21:29:07 +01:00
Martin McKeaveney 0f2bcf581d revert functionality working 2021-05-16 21:25:37 +01:00
Keviin Åberg Kultalahti 9329644cf5 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-14 17:49:09 +02:00
mike12345567 b416207292 Making sure routes are included. 2021-05-14 16:47:47 +01:00
mike12345567 a61edd8124 Formatting. 2021-05-14 16:32:51 +01:00
Keviin Åberg Kultalahti 4df56ce457 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-14 17:32:08 +02:00
mike12345567 c947199558 Adding administration roles API. 2021-05-14 16:31:07 +01:00
mike12345567 cea82f9335 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
Mike Shanks 04a159986e v0.8.18 2021-05-13 11:17:08 +01:00
mike12345567 5d387870d2 Updating valid to optionals. 2021-05-12 15:44:16 +01:00
mike12345567 2ba2e2e3e6 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 a289493224 Fixing an issue with the upload URL not being inserted in correct location. 2021-05-12 14:27:33 +01:00
mike12345567 abeb78d914 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 13:59:59 +01:00
Keviin Åberg Kultalahti 17eca8c30b Merge branch 'next' into admin/user-management-ui 2021-05-12 14:08:58 +02:00
mike12345567 13b1e78ee2 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 12:49:42 +01:00
Martin McKeaveney 022f501dee fixes from PR 2021-05-12 12:38:49 +01:00
mike12345567 2ec6b15e56 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 c70d4444a9 Formatting. 2021-05-11 15:24:17 +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
Martin McKeaveney 6a688c7aad merge 2021-05-11 14:58:55 +01:00
Martin McKeaveney b1d60cc6b6 email template E2E, adding preview 2021-05-11 14:44:43 +01:00
mike12345567 3e63c616d3 Merge branch 'admin/user-management-ui' of github.com:Budibase/budibase into admin/user-management-ui 2021-05-11 12:51:25 +01:00