pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-02-13 08:26:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'clients-user' of https://github.com/fosrl/pangolin into clients-user

Browse Source
This commit is contained in:
miloschwartz
2025-11-13 17:33:37 -05:00
parent 23c9827e4c 2973b61676
commit 08c82e072e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
messages/en-US.json
View File

@@ -2157,6 +2157,5 @@
"clients": "Clients", "clients": "Clients",
"accessClientSelect": "Select machine clients", "accessClientSelect": "Select machine clients",
"resourceClientDescription": "Machine clients that can access this resource", "resourceClientDescription": "Machine clients that can access this resource",
"regenerate": "Regenerate", "regenerate": "Regenerate"
"checkSelectedStatus": "Check Status of Selected"
} }

3
server/routers/olm/handleOlmRegisterMessage.ts
View File

@@ -42,7 +42,8 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
olm.userId, olm.userId,
olm.olmId, olm.olmId,
olm.name || "User Device", olm.name || "User Device",
doNotCreateNewClient ? true : false // doNotCreateNewClient ? true : false
true // for now never create a new client automatically because we create the users clients when they are added to the org
); );
} catch (err) { } catch (err) {
logger.error( logger.error(