1
0
Fork 0
mirror of synced 2024-08-20 20:41:37 +12:00
Commit graph

188 commits

Author SHA1 Message Date
Keviin Åberg Kultalahti
56e09c9b7b Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:21:48 +02: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
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
mike12345567
9b12de9162 Fixing an issue with platformUrl being required in settings. 2021-05-11 12:51:14 +01:00
mike12345567
1d643b6315 Adding link to the real email test. 2021-05-11 12:04:07 +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
075b00b534 Renaming registration to invite URL. 2021-05-10 15:05:06 +01:00
Martin McKeaveney
8174f44d40 pull template type from body instead of params 2021-05-10 14:41:52 +01:00
mike12345567
0d38d50878 Making sure relative logo URL is converted to a full path in templates. 2021-05-07 14:30:37 +01:00
mike12345567
4e3bc326b4 Updating with a tested and functional API for uploading files for configs. 2021-05-07 13:55:30 +01:00
Keviin Åberg Kultalahti
ad7e892226 Merge branch 'next' into admin/user-management-ui 2021-05-07 09:47:45 +02:00
Martin McKeaveney
062d8323f4 pulling app list, re-adding code for automation blocks and external data source block lost in merge 2021-05-06 18:31:03 +01:00
Martin McKeaveney
7588030780 SMTP and template management E2E 2021-05-06 18:02:44 +01:00
Andrew Kingston
5a642071d6 Configure vite with a base URL so proxy works 2021-05-06 17:22:09 +01:00
Keviin Åberg Kultalahti
555cdcd5c4 wip: skeleton for users page 2021-05-06 14:34:41 +02:00
Martin McKeaveney
6b9a223094 update scoped config imports 2021-05-06 12:09:35 +01:00
Martin McKeaveney
559b8789f6 merge with next 2021-05-06 11:56:53 +01:00
Martin McKeaveney
42e0b3c1f9 lint 2021-05-06 10:57:24 +01:00
Martin McKeaveney
7d09bd8d70 unit tests 2021-05-06 10:54:01 +01:00
mike12345567
8c1f274fbb Making some changes to how configs are scoped. 2021-05-06 10:51:21 +01:00
Martin McKeaveney
e8a5b0863c do not allow users to initialise again once an admin has been created 2021-05-05 22:06:31 +01:00
Martin McKeaveney
fd2e2c0415 first time setup E2E 2021-05-05 21:56:43 +01:00
Martin McKeaveney
ba2d72b205 renable worker protection 2021-05-05 20:59:16 +01:00
Martin McKeaveney
39b293aa9d endpoint for budibase configuration checklist 2021-05-05 20:58:31 +01:00
mike12345567
b3292e991a Making the code a query string parameter for invite/reset urls. 2021-05-05 18:13:59 +01:00
mike12345567
82687bad26 Merge branch 'next' of github.com:Budibase/budibase into feature/password-reset 2021-05-05 18:00:22 +01:00
mike12345567
83c16a9f14 Formatting. 2021-05-05 17:49:53 +01:00
mike12345567
2ee4fd21e4 Updating testing system across the board after playing around with it, having the worker tests run when top level test is ran, fixing environment in worker when testing, removing the use of redis (replacing with ioredis-mock) when in test. 2021-05-05 17:49:34 +01:00
mike12345567
48236b2c2f Formatting. 2021-05-05 16:00:15 +01:00