Bernd Schoolmann f7d466d3f9 Fix merge conflict

2025-09-04 21:53:47 +02:00

..

app

Feature flag ui changes

2025-09-04 21:23:09 +02:00

auth

fix(environment-selector): [PM-21214] Extension and desktop server selector have incorrect styling (#15920)

2025-08-12 13:57:52 -04:00

autofill

[PM-24158] Add Premium Check (#16042)

2025-09-04 12:33:39 -04:00

billing/app/accounts

[PM-24158] Add Premium Check (#16042)

2025-09-04 12:33:39 -04:00

images

[PM-16057] use Roboto as primary font (#14553)

2025-05-12 09:00:01 -04:00

key-management

Feature flag ui changes

2025-09-04 21:23:09 +02:00

locales

Merge branch 'main' into km/poc-windows-hello-2

2025-09-04 18:37:22 +02:00

main

Fix merge conflict

2025-09-04 21:53:47 +02:00

models/native-messaging

[PM-17666] Move Encstring to KM ownership (#15457)

2025-07-16 11:15:24 -04:00

platform

Disallow biometric key over IPC (#16161)

2025-09-02 13:09:03 +02:00

scss

[CL-836] Extract base css variables (#14733)

2025-08-29 10:43:38 +02:00

services

Fix linting

2025-09-04 21:48:08 +02:00

types

Feature flag ui changes

2025-09-04 21:23:09 +02:00

vault/app/vault

[PM-13374] Update all SDK uuids (#14962)

2025-08-29 13:09:33 -04:00

entry.ts

[PM-13361] Fix DDG backwards compat (#11804)

2024-10-31 18:03:24 +01:00

global.d.ts

[PM-3996] Scaffolding for preload script (#6065)

2023-10-12 11:50:17 +02:00

index.html

[PM-11766] Introduce SDK client (#10974)

2024-10-07 13:20:50 +02:00

main.ts

Merge branch 'main' into km/poc-windows-hello-2

2025-09-04 18:37:22 +02:00

package-lock.json

Bumped Desktop client to 2025.8.3

2025-08-28 21:52:41 +00:00

package.json

Bumped Desktop client to 2025.8.3

2025-08-28 21:52:41 +00:00

preload.ts

[PM-24748][PM-24072] Chromium importer (#16100)

2025-09-04 11:21:57 +02:00

utils.spec.ts

[SM-329] Merge libs/electron into desktop (#3989)

2022-12-02 12:45:09 +01:00

utils.ts

[PM-22789] Handle Autotype Hotkey Event (#15840)

2025-08-05 12:59:32 -04:00