Rory Powell
4b30a4e7ef
Prevent duplicate internal budibase users across tenants
2021-09-28 15:49:03 +01:00
Rory Powell
b964813fad
Prevent root account users being re-created as internal budibase users
2021-09-28 15:22:19 +01:00
Rory Powell
8642868c5e
Deprovisioning WIP
2021-09-28 09:48:00 +01:00
Martin McKeaveney
5a56570fdb
merge master
2021-09-27 22:31:13 +01:00
Martin McKeaveney
1e3fca15c5
abstract usagedoc creation into auth, create the doc if it doesn't exist
2021-09-27 17:35:22 +01:00
Martin McKeaveney
2da28ecc71
prevent SMTP fallback for automations
2021-09-27 16:28:39 +01:00
Martin McKeaveney
c25bd48616
SMTP config fallback logic
2021-09-27 15:10:06 +01:00
Martin McKeaveney
5b4bf74e2c
re-adding env var controls for cloud limit functionality
2021-09-27 15:03:48 +01:00
Martin McKeaveney
35d4eac78a
fallback SMTP configuration for cloud
2021-09-27 14:57:22 +01:00
Martin McKeaveney
6c7423e52e
ensure automation quotas are not incremented for test runs
2021-09-27 10:32:39 +01:00
Martin McKeaveney
c49b88b57a
automation runs quotas
2021-09-23 23:25:25 +01:00
Martin McKeaveney
4a2028c354
usageQuota middleware writing to couch
2021-09-23 22:40:14 +01:00
Martin McKeaveney
9b98985040
point logo upload to S3 bucket when not self hosted
2021-09-23 16:22:12 +01:00
Michael Drury
f45c780d99
Merge pull request #2698 from Budibase/feature/view-cloud-replacement
...
Cloud View replacement
2021-09-22 18:21:38 +01:00
Martin McKeaveney
68a72384c8
Merge pull request #2703 from Budibase/feature/analytics
...
Feature/analytics
2021-09-22 15:53:34 +01:00
Martin McKeaveney
87b61b5c54
added user created at timestamp
2021-09-22 09:29:51 +01:00
Rory Powell
9282b08890
Cloud SSO flow and auto login on verification
2021-09-21 18:20:26 +01:00
mike12345567
3da8adfe48
Merge branch 'develop' of github.com:Budibase/budibase into feature/view-cloud-replacement
2021-09-21 17:27:47 +01:00
mike12345567
e8e331e578
Removing use of db.post as its dangerous to allow the possibility of _id being auto-generated, these docs would be lost as we couldn't query them out by the usual id mechanism.
2021-09-21 16:07:04 +01:00
Rory Powell
1d873d9e11
Move all session population to budibase (bug fix)
2021-09-20 11:26:19 +01:00
Rory Powell
91b9a98247
Password reset for budibase users
2021-09-17 13:41:22 +01:00
Rory Powell
3576ca87be
Access controls for cloud, self, and regular budibase users
2021-09-15 15:45:43 +01:00
Rory Powell
011193a3dc
Navigate between budibase and account portal
2021-09-14 15:49:59 +01:00
Rory Powell
689065d2b8
Redirect to account portal login page in the cloud
2021-09-14 14:18:13 +01:00
Rory Powell
73981680ba
Replace 'sandbox' with 'cloud' in builder, reuse 'SELF_HOSTED' flag
2021-09-14 13:03:38 +01:00
Rory Powell
d2c5197fa0
Merge pull request #2574 from Budibase/feature/onboarding-backend
...
Add new redis key for email verification & pre-hashed password option
2021-09-14 11:17:54 +01:00
Martin McKeaveney
b83452f47c
merge with master
2021-09-10 14:43:03 +01:00
mike12345567
dbf830f12b
Fixing issue #2579 .
2021-09-09 17:59:44 +01:00
Rory Powell
d919c44185
Add pre-hased password option to admin creation
2021-09-09 17:08:27 +01:00
Martin McKeaveney
5e268dce18
Merge pull request #2556 from mslourens/checklist_item_navigation
...
add link to checklist items for direct navigation (and lint issues)
2021-09-09 11:16:38 +01:00
Rory Powell
bc50bf56db
Remove cors configuration
2021-09-08 12:13:57 +01:00
Rory Powell
fcf5aac7e6
Add configurable cors options to worker
2021-09-08 10:05:39 +01:00
Rory Powell
3d15db2223
Account portal cors and auth changes
2021-09-07 11:22:11 +01:00
Maurits Lourens
9338043133
fix test
2021-09-06 20:23:33 +02:00
Maurits Lourens
0b7bb885cc
fix unit test
2021-09-06 15:49:38 +02:00
Maurits Lourens
dafd06737c
add link to checklist items for direct navigation (and lint issues)
2021-09-06 15:16:21 +02:00
mike12345567
90f6dffc44
Fixing an issue with list of app URLs not loading correctly.
2021-08-31 13:42:04 +01:00
Martin McKeaveney
af4c1b23de
simplify couchDB configuration
2021-08-18 11:23:28 +01:00
Martin McKeaveney
87bf640a5d
conditionally apply username and password to couchdb auth
2021-08-17 16:48:02 +01:00
Martin McKeaveney
f4232bd7d7
couchDB auth options
2021-08-17 14:11:03 +01:00
Peter Clement
48c40446f0
Add link to account portal
2021-08-12 12:09:53 +01:00
Peter Clement
b2bc9a5e20
Add self-hosting upgrade button to builder pane
2021-08-12 11:51:08 +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
506ff7dcd3
Linting.
2021-08-06 16:39:30 +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
105dfb5eb9
Fixing an issue with OIDC URL for preauth.
2021-08-05 14:36:10 +01:00
mike12345567
9197a6e124
Making old google/oidc callback endpoints public.
2021-08-05 12:00:33 +01:00
mike12345567
78a3a1cd09
Fixing issue with google callback URL not being used when it was previously set.
2021-08-05 11:27:51 +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
Michael Drury
b86a6fddc9
Revert "Multi-tenancy/organisations"
2021-08-04 10:02:24 +01:00
mike12345567
4e13dde657
Fixing some issues highlighted by worker test cases.
2021-08-03 17:14:17 +01:00
mike12345567
88c07d28eb
Linting.
2021-08-03 15:41:51 +01:00
mike12345567
e7974f7e86
Implementing some changes to how context gets set for tenancy, after testing, as well as updating server.
2021-08-03 15:32:25 +01:00
mike12345567
f3ce979230
Linting.
2021-08-02 18:36:32 +01:00
mike12345567
7743384f77
re-write, to use the ideas that Rory put in place, still WIP, un-tested but all implemented.
2021-08-02 18:34:43 +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
8bcce17cd7
Removing unused mock.
2021-07-30 14:25:38 +01:00
mike12345567
79c5f01267
Fixing config test case.
2021-07-30 14:23:40 +01:00
mike12345567
5dfeb9b3ca
Limiting use of query string to a few select endpoints for determining tenant ID.
2021-07-27 18:02:59 +01:00
mike12345567
adf6d18cb1
Fixing some issues with public endpoints causing logout loop.
2021-07-27 16:17:02 +01:00
mike12345567
615053f201
Fixing some issues with org not being correctly detected.
2021-07-27 15:35:26 +01:00
mike12345567
dd1f1fec3b
Linting.
2021-07-26 13:31:39 +01:00
mike12345567
d03229caba
Adding in admin API backwards compat.
2021-07-26 13:23:11 +01:00
mike12345567
4606248ffd
Fixing up everything found when testing with Cypress.
2021-07-26 13:19:47 +01:00
mike12345567
c63ee57bbd
Linting.
2021-07-23 20:03:11 +01:00
mike12345567
4d0faa38e3
Changing how apps are retrieved to be more efficient.
2021-07-23 20:01:53 +01:00
mike12345567
9a9c552629
Adding mechanism for lookup of userId/email to tenantId.
2021-07-23 19:22:04 +01:00
mike12345567
82e43e0008
Removing accidental symbols.
2021-07-23 17:26:54 +01:00
mike12345567
9377c7b0f3
Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants
2021-07-23 17:20:41 +01:00
mike12345567
7588bfde39
Adjusting how redis modules are loaded, making sure client is always set, before init.
2021-07-23 16:53:22 +01:00
Rory Powell
eb8d857864
Require https callback in production, allow for http otherwise
2021-07-23 15:47:48 +01:00
Rory Powell
418637cb6b
Linting
2021-07-23 14:42:28 +01:00
Rory Powell
f95b550b15
Mark google activated by default for old configs
2021-07-23 14:40:22 +01:00
Rory Powell
249df46770
Mark google activated by default for old configs
2021-07-23 11:38:17 +01:00
mike12345567
3f7bafe23d
Linting.
2021-07-22 22:37:20 +01:00
mike12345567
313302cae2
Fixing test cases and bugs that they raised.
2021-07-22 22:36:16 +01:00
mike12345567
24012c2fba
Linting.
2021-07-22 16:37:50 +01:00
mike12345567
1d6a350311
Changing how flags are handled.
2021-07-22 16:36:21 +01:00
mike12345567
b21fe320c5
Adding fallbacks for oidc and google.
2021-07-22 15:26:14 +01:00
mike12345567
1b6a73c250
Linting.
2021-07-22 14:29:30 +01:00
mike12345567
27b2a13817
Swapping admin -> global in worker to reduce confusion in API url naming.
2021-07-22 12:56:47 +01:00
mike12345567
3305400c83
Fixing saving of oidc and google auth, neither should require the callbackURL property with the tenancy update.
2021-07-21 11:10:26 +01:00
mike12345567
b09c2d45f9
Linting and adding tenancy API.
2021-07-20 18:03:16 +01:00
mike12345567
129ff3fef2
Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants
2021-07-20 15:56:12 +01:00
Peter Clement
3f42ed74b9
Merge remote-tracking branch 'origin/develop' into oidc-config-management
2021-07-20 12:57:58 +01:00
Peter Clement
0fa68a2d50
Add activated toggle and login functionality to support this
2021-07-20 09:27:12 +01:00
mike12345567
83db31f899
A lot of general fixes around getting logged in, setting up users etc.
2021-07-19 19:00:53 +01:00
mike12345567
358b2aef89
Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants
2021-07-19 17:35:48 +01:00
mike12345567
e026375f50
Merge branch 'master' of github.com:Budibase/budibase into develop
2021-07-19 16:24:19 +01:00
mike12345567
e56a0f5aa3
Fixing some tenancy issues.
2021-07-19 12:57:52 +01:00
mike12345567
d157285918
Adding organisation page.
2021-07-16 18:24:32 +01:00
mike12345567
f3156fca06
Further work, tenancy now working but some more work to be done.
2021-07-16 18:04:49 +01:00
mike12345567
b7995dd61d
Updating auth to utilise the tenant system.
2021-07-16 15:08:58 +01:00
mike12345567
912659a8ad
First version of multi-tenancy, work still to be done.
2021-07-15 17:57:02 +01:00
Rory Powell
5f51de257f
Default public config.config when missing
2021-07-15 16:50:57 +01:00
Rory Powell
806957e462
Merge branch 'feature/oidc-support' of github.com:Budibase/budibase into feature/oidc-support
2021-07-15 16:21:03 +01:00
Rory Powell
33b352c3ef
Store OIDC config in cookie instead of URL
2021-07-15 16:20:31 +01:00
Peter Clement
70ab4e4dc5
add new logic to support oauth and oidc buttons
2021-07-15 15:49:10 +01:00
Rory Powell
239e39e5ed
Merge branch 'develop' into feature/oidc-support
2021-07-15 14:05:30 +01:00
mike12345567
a9160f5914
Rewording email template descriptions.
2021-07-14 13:24:46 +01:00
mike12345567
a31cce0ff9
Linting.
2021-07-14 13:18:27 +01:00
mike12345567
c20fde41ee
Some quick fixes after a user had some confusion over how the email templating works, just adding some detail that should help explain.
2021-07-14 11:23:24 +01:00
Peter Clement
283698f8c5
Fix config form saving bugs
2021-07-13 21:47:36 +01:00
Rory Powell
0973394208
Update config checklist to handle multiple sso sources
2021-07-13 17:30:17 +01:00
mike12345567
cc08b4fc4e
Linting.
2021-07-13 17:28:05 +01:00
mike12345567
004f719dde
Renaming groups to workspaces.
2021-07-13 17:27:04 +01:00
Rory Powell
dd306d59c5
Load oidc config by id
2021-07-13 17:07:48 +01:00
Peter Clement
9dd05ec96e
Add UUID to each oidc config to distinguish each provider
2021-07-13 15:52:21 +01:00
Peter Clement
af792cc09e
improve structure of OIDC config
2021-07-13 14:55:14 +01:00
Rory Powell
5f5fe92807
Refactor auth controller tests to reuse common behaviour
2021-07-13 10:28:15 +01:00
Martin McKeaveney
bebfe4c6e1
merge with master
2021-07-11 18:07:46 +01:00
Rory Powell
4d3f44f982
Unit test auth controller oidc functions
2021-07-11 17:54:18 +01:00
Kyle Harrison
2d451bb3a9
apply fixes for common spelling mistakes
2021-07-09 17:54:49 +01:00
Peter Clement
b94348dddc
Fix OIDC logo conditional display
2021-07-09 15:50:46 +01:00
Peter Clement
5a86d6bb6d
Linting and Optimisation
2021-07-09 15:05:39 +01:00
Peter Clement
7138070e4c
Fix bug where OIDC icon was not being displayed due to misconfiguration
2021-07-09 14:18:03 +01:00
Peter Clement
bcfbca0f08
Add oidc icon and name to public api for login page
2021-07-09 09:49:16 +01:00
Rory Powell
73c8dcf71b
Merge branch 'develop' into feature/oidc-support
2021-07-08 20:15:16 +01:00
Rory Powell
1c18b4c6ac
remove duplicate scope definition
...
scope can be defined both within the strategy declaration or when invoking passport
2021-07-08 15:21:54 +01:00
Rory Powell
c16cfc328f
Linting
2021-07-08 13:12:25 +01:00
Rory Powell
ec93d15462
Integrate with configuration ui / support for email usernames
2021-07-08 13:04:04 +01:00
Rory Powell
f0016f4bde
Merge branch 'feature/oidc-support' of github.com:Budibase/budibase into feature/oidc-support
2021-07-08 11:12:45 +01:00
Rory Powell
25f1368227
Merge google/oidc user authentication and surface user relevant error messages during authentication
2021-07-08 11:12:34 +01:00
mike12345567
b0fb7ae991
Fixing test cases.
2021-07-08 00:30:55 +01:00
mike12345567
93302cb667
Linting.
2021-07-07 23:30:14 +01:00
mike12345567
4916ff7eb8
Adding sessions API.
2021-07-07 23:29:19 +01:00
Peter Clement
2e49686eab
Merge branch 'feature/oidc-support' of https://github.com/Budibase/budibase into oidc-config-management
2021-07-07 17:42:31 +01:00
Peter Clement
7a51eba93c
Add OIDC icon to login page
2021-07-07 17:39:26 +01:00
Peter Clement
37b1200051
Allow user uploaded icons in oidc config
2021-07-07 13:41:09 +01:00
Rory Powell
c15051462e
Add info to 403 responses
2021-07-07 13:28:55 +01:00
mike12345567
b847f85d91
WIP - first version of user sessions.
2021-07-06 18:10:04 +01:00
Rory Powell
7803540399
Use configuration url to retrieve oidc endpoints
...
The /.well-known/openid-configuration endpoint can be used to
retrieve the majority of configuration needed for oidc
Additionally refactor the callback url to be generated on the server
side as this is a fixed endpoint.
Add linting fixes
2021-07-06 10:03:40 +01:00
Bernhard Hayden
baab7141c0
Proof of concept OIDC implementation
2021-07-06 10:03:40 +01:00
Peter Clement
0e6fb73b9e
Add validation to backend for OIDC configuration
2021-07-05 14:27:19 +01:00
mike12345567
ae84345d27
Fixing issue with full list of apps not appearing in user administration, meaning couldn't update roles.
2021-07-01 11:29:27 +01:00
mike12345567
f4757aeee1
Fixing issues discovered by cypress tests.
2021-06-21 18:37:14 +01:00
mike12345567
7039b8d7eb
Linting.
2021-06-21 18:02:09 +01:00
mike12345567
61d810edfe
Implementing feature #1700 and making it possible to remove logo.
2021-06-21 18:01:25 +01:00
mike12345567
ed5dd08c66
Fixing authentication with API key issue.
2021-06-21 17:13:06 +01:00
mike12345567
052d14ad38
Fixing issue with 1:N relationships and multiple fields, issue #1753 .
2021-06-20 10:53:55 +01:00
Andrew Kingston
ab6e31811b
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
32a3c2bbb6
Lint with prettier
2021-06-15 19:39:40 +01:00
mike12345567
290cf98704
Adding longer timeout for real email tests.
2021-06-15 13:22:38 +01:00
mike12345567
86f13557ca
Adding options to SMTP form for configuring TLS/STARTTLS.
2021-06-10 11:25:06 +01:00
mike12345567
22431a4ea2
Updating SMTP config to show better errors.
2021-06-09 15:45:54 +01:00
Michael Drury
b48342c55c
Linting.
2021-06-08 18:29:34 +01:00
mike12345567
fe66c3535c
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
1e9ce62261
Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes
2021-06-07 13:22:27 +01:00
mike12345567
1da4b31890
Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes
2021-06-02 10:08:57 +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
edfc23454d
Merge branch 'master' of https://github.com/Budibase/budibase into lab-day-2705
2021-06-01 19:24:24 +01:00
mike12345567
c81a8ba3ed
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
0c90f9ffc5
adding watchtower to docker config
2021-05-28 10:09:32 +01:00
mike12345567
1146d508fd
Fixing app cypress test cases.
2021-05-25 13:25:42 +01:00
mike12345567
921eb39227
Fixing the creation of user in cypress.
2021-05-25 11:06:50 +01:00
mike12345567
18dd7322e4
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
7e6f215598
Linting and fixing an issue with the dev pass through.
2021-05-24 16:20:02 +01:00
mike12345567
4b786f51d2
Formatting.
2021-05-24 14:56:23 +01:00
mike12345567
0a4c4f1cc0
Adding some changes for to redis library, allowing reconnection.
2021-05-24 14:54:47 +01:00
mike12345567
59de40c4ef
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
348c61a8c5
Merge branch 'master' of github.com:Budibase/budibase into fix/lockdown-admin
2021-05-21 16:54:52 +01:00
mike12345567
c6a6d49cd7
Updating administration middleware so that internal requests allowed through automatically.
2021-05-21 16:43:01 +01:00
Michael Drury
7fb9673217
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
ede7e38442
Merge branch 'master' of github.com:Budibase/budibase into feature/app-updated-at
2021-05-21 14:57:41 +01:00
mike12345567
a6e196a351
Making sure roles object is always present, issue #1529 .
2021-05-21 14:56:06 +01:00
Martin McKeaveney
bef216527d
simpler check using checklist
2021-05-21 14:55:11 +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
Keviin Åberg Kultalahti
a4de6d49c8
Merge branch 'master' into fixes/user-management
2021-05-21 13:32:55 +02:00
Michael Drury
f76c7d9684
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
8735ef088f
change forceReset bool name
2021-05-21 12:10:02 +02:00
Martin McKeaveney
e83f600b9e
removing skip_setup as it was preventing init
2021-05-20 21:42:27 +01:00
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
Keviin Åberg Kultalahti
0346ef9bb1
Merge branch 'next' into fixes/user-management
2021-05-20 11:02:15 +02: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
Keviin Åberg Kultalahti
dc0fb8fbfe
add forcePasswordReset bool to user object validation
2021-05-19 13:24:14 +02: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