Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4638 commits
Select commit Hold shift + click to select a range
e5fd8fa
Prevent concurrent referral spotlight feature PUTs
Apr 21, 2026
558beeb
Merge branch 'referral-feature-code-fix' into 'main'
Apr 21, 2026
f2efdde
VPNPLG-58: Add payload and telemetry when forking the session
Apr 21, 2026
c9b84c1
Merge branch 'VPNPLG-58-add-telemetry-when-forking-session' into 'main'
Apr 21, 2026
c073469
fix: fix icon alignment in cancellation flow
nico3333fr Apr 21, 2026
9c0b861
Merge branch 'fix-icon-alignment-cancel-flow' into 'main'
Apr 21, 2026
600b4db
Add offer card UI components
fraser-proton Apr 21, 2026
548e7f8
Merge branch 'offer-UI-components' into 'main'
Apr 21, 2026
3ebe1b3
added temporary need content and config
fraser-proton Apr 21, 2026
ee493a5
Merge branch 'INWEB-887-temporary-need-content' into 'main'
Apr 21, 2026
bda929c
feat: workspace premium cancelation flow
Apr 21, 2026
7491345
Merge branch 'feat/workspace-premium-cancelation' into 'main'
Apr 21, 2026
e9e89b1
Add news subscription for Meet
Apr 16, 2026
baf7dac
Merge branch 'feat/meet-newsletter' into 'main'
Apr 21, 2026
b02d9e8
use the same setting menu for extension as for web
nguyenkims Apr 21, 2026
4a57330
Merge branch 'IDTEAM-5749-same-menu-for-extension' into 'main'
Apr 21, 2026
fdccfb2
INWEB-867: Add common setup for Slack API in the CI
Apr 17, 2026
e4513fe
Merge branch 'INWEB-867/setup' into 'main'
Apr 21, 2026
f3d8045
Add new permissions modals and stop requesting permissions automatically
RayoProton Apr 21, 2026
b7166de
Merge branch 'no-permissions-modal' into 'main'
Apr 21, 2026
49d9dfc
DRVWEB: Search blobs encryption/decryption
Apr 21, 2026
3300f60
Merge branch 'search-encryption' into 'main'
Apr 21, 2026
85f1b60
Add telemetry for sharing
D-Bao Apr 16, 2026
751f3bc
Merge branch 'IDTEAM-5613-sharing-telemetry' into 'main'
Apr 21, 2026
b37ede1
Limit sharing settings visibility only to admins on parent share
Apr 21, 2026
329a9a5
Merge branch 'fix/drive-admin-sharing-settings-visibility' into 'main'
Apr 21, 2026
bb24168
[DRVWEB-4974] Album listing sdk
HeadFox Apr 21, 2026
7e9f1cb
Merge branch 'DRVWEB-4974-album-listing-sdk' into 'main'
Apr 21, 2026
0fed6d4
Enable telemetry for Meet
Apr 21, 2026
fb8c511
Merge branch 'feat/meet-telemetry' into 'main'
Apr 21, 2026
78d0a37
Allow expanding message when clicking on recipient name or address
LeGrosSancho Apr 21, 2026
8c06ff5
Merge branch 'INBWEB-924-allow-expanding-message-when-clicking-on-rec…
Apr 21, 2026
18c826c
[DRVWEB-5391] fix signature issue on public download
Apr 21, 2026
ff9c0bb
Merge branch 'DRVWEB-5391-fix-signatureissue-on-public-download' into…
Apr 21, 2026
6bda61f
Feedback first cancellation offer logic and content
fraser-proton Apr 21, 2026
b3075fd
Merge branch 'INWEB-885-payment-logic-and-content' into 'main'
Apr 21, 2026
570c85b
AdminRoles(Account): Implement API call to get roles for MemberID
Apr 22, 2026
68258ad
Merge branch 'adminrole/user-page/02-2-fetch-member-role' into 'main'
Apr 22, 2026
e7b5591
Add debug mail store button and modal
LeGrosSancho Apr 22, 2026
8a243d3
Merge branch 'P3-295-add-store-debug-mode' into 'main'
Apr 22, 2026
fbf652e
Add unauth lost 2fa e2e tests
StraightOuttaCrompton Apr 15, 2026
89b47db
Merge branch 'worktree-CP-11716-unauth-lost-2fa-tests' into 'main'
Apr 22, 2026
86c49e1
change "pass unlimited" to "proton unlimited"
nguyenkims Apr 22, 2026
8f1a434
Merge branch 'fix-typo-pass-onboarding' into 'main'
Apr 22, 2026
f4df606
Added 1domain support for vpnbiz2023
lkpch Apr 21, 2026
30f131d
Merge branch 'P2-2113-add-1domain-vpnbiz2023' into 'main'
Apr 22, 2026
b59ec08
Report block verification to erroring users
horejsek Apr 22, 2026
bc3e54b
Merge branch 'drive/fix-sdk-metrics' into 'main'
Apr 22, 2026
471775a
Attempt to fix drawer apps that cannot be closed
LeGrosSancho Apr 22, 2026
3b11c0f
Merge branch 'use-parent-app-when-resuming-session-failed' into 'main'
Apr 22, 2026
a3b3a29
Avoid layout shift when typing in empty composer
Apr 21, 2026
ec1f1c1
Merge branch 'fix/lumo-layout-shift' into 'main'
Apr 22, 2026
1619740
Tech: add useSubscriptionCheck hook
Apr 22, 2026
6a5a7c0
Merge branch 'tech/extract-useSubscriptionCheck-hook' into 'main'
Apr 22, 2026
cb95b48
Fix recovery issue with photos
HeadFox Apr 22, 2026
03b9351
Merge branch 'drive/fix-photos-recovery' into 'main'
Apr 22, 2026
cef2cc1
Fix bad org or group name causing issues
pedroamaroproton Apr 22, 2026
9e85999
Merge branch 'fix-bad-org-group-name' into 'main'
Apr 22, 2026
d57cd90
Final polishes and orchestrator component for cancellation flow
fraser-proton Apr 22, 2026
2d413c1
Merge branch 'feedback-first-cancellation-flow' into 'main'
Apr 22, 2026
2ecd022
MEET-279: participants role, share screen slice and other UIs fixes
RayoProton Apr 22, 2026
64f2c7f
Merge branch 'roles-and-ui' into 'main'
Apr 22, 2026
f967382
DRVWEB-5359: Include trashed items in search index (without exposing …
Apr 22, 2026
122786f
Merge branch 'DRVWEB-include-trashed-items-in-index' into 'main'
Apr 22, 2026
11f0e4f
[IDTEAM-5924] Remove cycle param in pass signup, keep the cycle page
Swiip Apr 21, 2026
8bcad7c
Merge branch 'IDTEAM-5924-remove-cycle-param' into 'main'
Apr 22, 2026
f5efd9b
Bump Astro based on security report
Swiip Apr 22, 2026
5801367
Merge branch 'IDTEAM-0000-bump-astro-6.1.6' into 'main'
Apr 22, 2026
7f4bf23
Fix effect dependencies of AutomaticSubscriptionModal
lkpch Apr 22, 2026
ffbb2f4
Merge branch 'P2-2116-fix-automatic-subscription-modal' into 'main'
Apr 22, 2026
b7a4fce
DRVWEB-5346 : Display indexing progress
Apr 22, 2026
572b1e1
Merge branch 'DRVWEB-indexing-progress' into 'main'
Apr 22, 2026
1267d3b
New recovery settings
Mar 16, 2026
17d8d08
Redux refactor
mmso Apr 22, 2026
d94e08c
Merge branch 'recovery-settings' into 'main'
mmso Apr 22, 2026
91a49a2
Add tests for new reset password flow
Vijayasingam Apr 22, 2026
65000d5
Merge branch 'reset-password-tests' into 'main'
Apr 22, 2026
56867c3
Get syncs & importers after creating a BYOE address
LeGrosSancho Apr 22, 2026
5d052e5
Merge branch 'P1-441-call-event-loop-when-creating-byoe-address' into…
Apr 22, 2026
ae2b29e
Add small delay to process events via bus driver
horejsek Apr 22, 2026
79f7dc8
Merge branch 'drive/bus-driver-emit-small-delay' into 'main'
Apr 22, 2026
cce305d
Do not show BYOE setup modal when user is busy
LeGrosSancho Apr 22, 2026
8003969
Merge branch 'P1-440-do-not-show-byoe-setup-modal-when-busy' into 'main'
Apr 22, 2026
a34b349
[IDTEAM-4633] QA findings 2
Swiip Apr 22, 2026
0d07b2c
Merge branch 'IDTEAM-4633-desktop-unlock-qa-findings-2' into 'main'
Apr 22, 2026
4e65f03
Settings card margins
Apr 22, 2026
b47805c
Merge branch 'settings-card-layout-margins' into 'main'
Apr 22, 2026
3d46cdf
Tech: extract telemetry related functions + switchCycle from subscrip…
Apr 22, 2026
e6e6b2d
Merge branch 'tech/extract-switchCycle-subscriptionContainer' into 'm…
Apr 22, 2026
a8a841a
Docs: fix blank viewer render when Lexical ref attaches after userMod…
Apr 22, 2026
82b0afd
Merge branch 'fix/viewer-preview-blank-editor-ref-race' into 'main'
Apr 22, 2026
139f7af
Recovery settings fixes
mmso Apr 22, 2026
79fd881
Merge branch 'recovery-settings' into 'main'
Apr 22, 2026
d221371
Small UI improvement of debug view
flavienbonvin Apr 21, 2026
dadc627
Move the button to the quick settings
flavienbonvin Apr 22, 2026
a5eb7ac
Persist the debug state in local storage
flavienbonvin Apr 22, 2026
cad695d
Merge branch 'P3-295-add-store-debug-mode' into 'main'
Apr 22, 2026
00da99c
Moved hooks to correct folder and updated imports for cancellation flow
fraser-proton Apr 22, 2026
4104168
Merge branch 'move-cancellation-eligibility-hook' into 'main'
Apr 22, 2026
369fb83
Drop `Banner.dismissible` causing a warning if used
djankovic Apr 22, 2026
9fd866d
Merge branch 'hotfix/no-banner-dismissible' into 'main'
Apr 22, 2026
b7bb37f
Add scroll restoration to settings
mmso Apr 22, 2026
8cfb2f0
Merge branch 'add-scroll-restoration' into 'main'
Apr 22, 2026
dfe39e9
fix: bumped Astro dependency
nico3333fr Apr 22, 2026
06ed1d3
Merge branch 'fix-bumped-astro' into 'main'
Apr 22, 2026
ce56d49
Remove cert pinning for livekit.proton.me
Apr 22, 2026
ace3b76
Merge branch 'feat/meet-desktop-v1.0.9' into 'main'
Apr 22, 2026
3954bc6
i18n(calendar): update translations from crowdin 61aca4d1c2
Apr 23, 2026
48ad579
i18n(mail): update translations from crowdin b1319511be
Apr 23, 2026
bb7fbcd
i18n(drive): update translations from crowdin 3e46537db0
Apr 23, 2026
1a9fe5c
i18n(account): update translations from crowdin 4bf2a73d6c
Apr 23, 2026
a6db5e0
i18n(vpn-settings): update translations from crowdin b085d5c82a
Apr 23, 2026
69156c7
i18n(verify): update translations from crowdin 0a13c75fea
Apr 23, 2026
bd35d9a
i18n(pass): update translations from crowdin 767ad3ad8f
Apr 23, 2026
db4dbfb
i18n(pass-web): update translations from crowdin 952d4cd181
Apr 23, 2026
53257cc
i18n(pass-desktop): update translations from crowdin a61d80e100
Apr 23, 2026
3c082e8
i18n(wallet): update translations from crowdin a71333225b
Apr 23, 2026
ca6b3ce
i18n(docs): update translations from crowdin c7cc5b26dd
Apr 23, 2026
f1e5806
i18n(docs-editor): update translations from crowdin 8ceabf590c
Apr 23, 2026
ef9dbcc
i18n(lumo): update translations from crowdin 554adc1b99
Apr 23, 2026
e244230
i18n(meet): update translations from crowdin 83bab8bc9d
Apr 23, 2026
87d9a4a
Merge branch 'translations_2026-04-23_050339_433ddcd5' into 'main'
Apr 23, 2026
a466303
Keep modal opened in a loading state before showing success modal
LeGrosSancho Apr 23, 2026
f94c53c
Merge branch 'P1-445-improve-add-byoe-loading-state' into 'main'
Apr 23, 2026
71dd101
Disable import capabilities when offline
edvincandon Apr 22, 2026
876c098
Merge branch 'IDTEAM-5385-offline-import-disable' into 'main'
Apr 23, 2026
d6dc802
Drive admin panel file explorer
HeadFox Apr 23, 2026
a1ae496
Merge branch 'feat/DRVBE-admin-panel-file-explorer-improvements' into…
Apr 23, 2026
8898518
Check participant id from mls message
Linquas Apr 23, 2026
fa87792
Merge branch 'check-participant-id-from-mls' into 'main'
Apr 23, 2026
39ef72d
NOISSUE: Remove divider and simplify styling for TvContainer
Apr 17, 2026
7534c18
Merge branch 'noissue-simplify-styling-for-TvContainer' into 'main'
Apr 23, 2026
1a56574
Recovery score modal enhancement
Apr 23, 2026
9f13bd2
Merge branch 'recovery-score-modal-inactive-options' into 'main'
Apr 23, 2026
5eb4eff
VPNPLG-63: Create a confirmation step before forking the session
Apr 22, 2026
8d49259
Merge branch 'VPNPLG-63-create-a-confirmation-step-before-forking-the…
Apr 23, 2026
629b226
Bump sdk to 0.14.8
HeadFox Apr 23, 2026
b6efb52
Merge branch 'drive/bump-sdk-0-14-8' into 'main'
Apr 23, 2026
a7989d4
Extract computeFilteredCounts and updateTotal in helper file
flavienbonvin Apr 21, 2026
0cd90f0
Update counters after event-loop update
flavienbonvin Apr 21, 2026
45c401f
Add tests on event-loop update and context total helpers
flavienbonvin Apr 21, 2026
517d2fe
Remove after context total computation from update method
flavienbonvin Apr 22, 2026
1df4fb2
Merge branch 'P3-291-event-loop-context-count-update' into 'main'
Apr 23, 2026
32fd6d3
Strip category from params to know if refreshing is allowed when clic…
LeGrosSancho Apr 23, 2026
87a789d
Merge branch 'INWEB-921-fix-inbox-sidebar-item-loading' into 'main'
mmso Apr 23, 2026
8e1d312
Use the BYOE feature when creating a token
LeGrosSancho Apr 23, 2026
09aecbc
Merge branch 'use-byoe-feature-during-token-creation' into 'main'
mmso Apr 23, 2026
b31b833
Fix initial loading state
mmso Apr 23, 2026
816effc
Merge branch 'fix-vpn-loading' into 'main'
mmso Apr 23, 2026
8027ab5
Fix Void all recovery files button
Apr 23, 2026
c076230
Merge branch 'recovery-file-download-section-fix' into 'main'
Apr 23, 2026
f216d8a
Open born private URL in browser and not desktop app
flavienbonvin Apr 13, 2026
2949a89
Merge branch 'born-private-desktop-fix' into 'main'
Apr 23, 2026
77ffdbb
Fix mic still being active after leaving meeting
Apr 23, 2026
8e135dd
Merge branch 'feat/mic-leave-notification' into 'main'
Apr 23, 2026
f2dcf72
Show lost 2fa cta if only security key added
StraightOuttaCrompton Apr 23, 2026
819be91
Merge branch 'show-lost-2fa-when-only-security-key-enabled' into 'main'
Apr 23, 2026
bbb7fd1
Docs: preserve scroll in preview mode by syncing state without remount
Apr 23, 2026
a0242b8
Merge branch 'fix/viewer-preview-scroll-jumps' into 'main'
Apr 23, 2026
4f1dda3
Recovery page enhancements
Apr 23, 2026
8e871f6
Merge branch 'recovery-page-enhancements' into 'main'
Apr 23, 2026
20feae7
P2 2076 remove lumo from vpn plus checkout 3
lkpch Apr 23, 2026
ea02f1e
Merge branch 'P2-2076-remove-lumo-from-vpn-plus-checkout-3' into 'main'
Apr 23, 2026
3a719dc
Fix - Improve info message for disabled Account monitor for B2C users
Apr 23, 2026
12773b8
Merge branch 'fix/disabled-account-monitor-b2c' into 'main'
Apr 23, 2026
68a49ad
[IDTEAM-5707] Form reset to not close password modal
Swiip Apr 23, 2026
3da140f
Merge branch 'IDTEAM-5707-fix-extra-password' into 'main'
Apr 23, 2026
33c8f61
[VPNB2B-74] Define search settings from nav resolved as a separate me…
asieraduriz Apr 23, 2026
500430e
Merge branch 'VPNB2B-74--define-search-settings' into 'main'
Apr 23, 2026
7ba13bd
[DRVWEB-5084] Component testing sharing modal
Apr 23, 2026
29a3079
Merge branch 'feature/DRVWEB-5084-sharing-modal-test' into 'main'
Apr 23, 2026
c515a54
Docs/Sheets: Show environment in version number
Apr 23, 2026
ccf8778
Merge branch 'docs-version-number' into 'main'
Apr 23, 2026
f8aeab2
INWEB-865: Add core logic for automated patching
Apr 17, 2026
5b45bc1
Merge branch 'INWEB-865/add-skeleton' into 'main'
Apr 23, 2026
39ed547
Add opaque and borderless Banner variants
djankovic Apr 23, 2026
88e3c99
Merge branch 'oles-banner-variants' into 'main'
Apr 23, 2026
802e8f3
Update category onboarding to use categoryID
flavienbonvin Apr 13, 2026
085f081
Move categories card below upsell banner
flavienbonvin Apr 13, 2026
151e002
Change borders on category onboarding items
flavienbonvin Apr 13, 2026
ef61153
Delete customization spotlight
flavienbonvin Apr 13, 2026
79dc755
Review of categories onboarding
flavienbonvin Apr 23, 2026
f3033f8
Small UI tweak of the b2c category onboarding card
flavienbonvin Apr 23, 2026
c71ce9b
Improve image loading on category b2b modal
flavienbonvin Apr 23, 2026
5fb3c5a
Add missing alt and update SCSS size
flavienbonvin Apr 23, 2026
8b64b76
Merge branch 'P3-283-onboarding-categoryIDs' into 'main'
Apr 23, 2026
737015a
Handle empty DisplayName
Apr 23, 2026
328d93a
Merge branch 'fix/encrypted-name' into 'main'
Apr 23, 2026
66ee78b
Always show Edit billing address button
lkpch Apr 23, 2026
5815cd9
Merge branch 'P2-2120-always-show-edit-billing-address' into 'main'
Apr 23, 2026
8583a21
Fix appearance of the header in the settins of public sharing
Apr 23, 2026
d9ad4b1
Merge branch 'fix/drive-admin-sharing-public-settings-header-appearan…
Apr 23, 2026
83b828f
Albums/Photos refactor followup fixes
HeadFox Apr 23, 2026
9d652fa
Merge branch 'drive/albums-fixes-followup' into 'main'
Apr 23, 2026
a3229cb
Disable payment method selection while processing payment
lkpch Apr 23, 2026
86073d2
Merge branch 'P2-1864-fix-endless-loading' into 'main'
Apr 23, 2026
912583f
[DRVWEB-5397] fix sharable upload inside shared with me folder
Apr 23, 2026
04d438f
Merge branch 'DRVWEB-5397-no-share-on-upload-of-shared-folder' into '…
Apr 23, 2026
c249000
Upgrade fast-xml-parser and uuid
Vijayasingam Apr 23, 2026
4bc6e24
Merge branch 'fix-vulnerabilities' into 'main'
Apr 23, 2026
e38e936
[DRVWEB-5362] Remove any email related info on public page for editor…
HeadFox Apr 23, 2026
44090d4
Merge branch 'DRVWEB-5362-hide-email' into 'main'
Apr 23, 2026
e6244d6
Docs: seed share modal title with current document name on open
Apr 23, 2026
450711f
Merge branch 'docs/fix-share-modal-stale-title' into 'main'
Apr 23, 2026
ad3ff69
Setup redirect between new and old recovery page
Vijayasingam Apr 23, 2026
d2414a6
Merge branch 'recovery-page-setup-redirects' into 'main'
Apr 23, 2026
49a8a18
test: remove storybook props from screenshots
Apr 23, 2026
c39da0b
Merge branch 'storybook-remove-props-tests' into 'main'
Apr 23, 2026
d74ce6e
Docs/Sheets: Apply base commit messages one-by-one
Apr 23, 2026
96a7d03
Merge branch 'docs-sheets-send-base-commit-message' into 'main'
Apr 23, 2026
5d2d890
Add comment on update elements to explain trade-off
flavienbonvin Apr 23, 2026
4167588
Merge branch 'comment-event-loop' into 'main'
Apr 24, 2026
1ecd3d6
Improve error handling for streaming
horejsek Apr 24, 2026
2f4196c
Merge branch 'drive/fix-streaming-error-handling' into 'main'
Apr 24, 2026
6bfa87d
[VPNB2B-58] Update nav resolver API
asieraduriz Apr 24, 2026
5927770
Merge branch 'VPNB2B-58--update-resolver-api' into 'main'
Apr 24, 2026
24ef7e7
Conditionally disable 1domain-vpnbiz2023
lkpch Apr 24, 2026
4cd8c29
Merge branch 'P2-2118-conditionally-disable-1domain-vpnbiz2023' into …
Apr 24, 2026
42797d4
[IDTEAM-4633] Improved desktop app ipc to host reconnection
Swiip Apr 23, 2026
a9ac4d5
Merge branch 'IDTEAM-4633-desktop-unlock-qa-findings-3' into 'main'
Apr 24, 2026
535e48f
DRVWEB: Search index maintenance - stale entry and blob cleanup tasks
Apr 24, 2026
f053ac8
Merge branch 'DRVWEB-maintenance-task' into 'main'
Apr 24, 2026
4495b6b
P3-299 - add title on category tab
flavienbonvin Apr 24, 2026
54e03d8
P3-298 - fix focus ring visibility and color
flavienbonvin Apr 24, 2026
f8d0757
Merge branch 'category-view-polish' into 'main'
Apr 24, 2026
7906d9f
Idteam 5873 fix safari too small popup
nguyenkims Apr 24, 2026
8d7f741
Merge branch 'IDTEAM-5873-fix-safari' into 'main'
Apr 24, 2026
3bb078b
Add `justify-start-when-stacked` table helper
nico3333fr Apr 24, 2026
0cd064a
Merge branch 'oles-table-style' into 'main'
Apr 24, 2026
4837331
Prevent missing navigator.mediaDevices to throw
RayoProton Apr 24, 2026
97863bb
Merge branch 'navigator-media-fix' into 'main'
Apr 24, 2026
b64a1c0
Update category counts when labelling a message from a conversation
LeGrosSancho Apr 24, 2026
df234a6
Merge branch 'P3-292-fix-label-message-action' into 'main'
Apr 24, 2026
1d649a2
Update openSubscriptionModal usage
lkpch Apr 24, 2026
d2955e4
Merge branch 'P2-2074-update-upen-subscription-modal-usage' into 'main'
Apr 24, 2026
d2a613f
Fix a bug storing feature flags in cookie
Vijayasingam Apr 24, 2026
3016477
Merge branch 'fix-ff-cookie' into 'main'
Apr 24, 2026
f675d9e
[DRVWEB-4967] delete legacy drive view
Apr 24, 2026
0400bed
Merge branch 'DRVWEB-4967-delete-public-page-section' into 'main'
Apr 24, 2026
1a27578
NOISSUE: Adapt telemetry for tv flow
Apr 23, 2026
5d831d5
Merge branch 'noissue-adapt-telemetry-for-tv-flow' into 'main'
Apr 24, 2026
4f3d624
Defer update prompt if user is in meeting
Apr 24, 2026
057516a
Merge branch 'fix/proton-meet-desktop' into 'main'
Apr 24, 2026
2311fe8
Mail BYOE: hide lock icons in sent messages when `X-Pm-Byoe` header i…
Apr 24, 2026
5b3826d
Merge branch 'feat/byoe-hide-sent-padlock' into 'main'
Apr 24, 2026
e0e94e9
PostQuantumOptInModal: prompt for auth before committing the opt-in
Apr 24, 2026
62ee7cb
Merge branch 'feat/pqc-auth-scope' into 'main'
Apr 24, 2026
8f41d08
Add LoginLink member creation mode
Apr 24, 2026
0ff71a5
Merge branch 'oles-account-creation' into 'main'
Apr 24, 2026
8d0a146
feat(sheets): remember last active sheet on reopen
the-narwhal Apr 26, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 8 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@ trim_trailing_whitespace = false
[*.scss]
indent_size = 2
indent_style = tab

[tests/mail-renderer/public/**]
trim_trailing_whitespace = false
insert_final_newline = unset
indent_style = unset
indent_size = unset
end_of_line = unset
charset = unset
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ tsconfig.tsbuildinfo
.netlify
storybook-static
i18n-js
translations.pot
po
coverage
lib-cov
Expand All @@ -39,6 +40,7 @@ build
*.code-workspace
.vscode
.nyc_output
test-results
tests/**/*.png
!tests/**/*-linux.png
!tests/mail/**/*.png
Expand Down
40 changes: 40 additions & 0 deletions .grype.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,31 @@ ignore:
name: golang.org/x/crypto
type: go-module
version: v0.0.0-20220829220503-c86fa9a7ed90
- vulnerability: CVE-2025-68121
package:
name: stdlib
type: go-module
version: go1.15.5
- vulnerability: CVE-2025-68121
package:
name: stdlib
type: go-module
version: go1.18.8
- vulnerability: CVE-2025-68121
package:
name: stdlib
type: go-module
version: go1.24.5
- vulnerability: CVE-2025-22871
package:
name: stdlib
type: go-module
version: go1.18.8
- vulnerability: CVE-2025-22871
package:
name: stdlib
type: go-module
version: go1.15.5
- vulnerability: CVE-2024-24790
package:
name: stdlib
Expand Down Expand Up @@ -114,6 +139,21 @@ ignore:
name: stdlib
type: go-module
version: go1.18.8
- vulnerability: CVE-2026-27143
package:
name: stdlib
type: go-module
version: go1.15.5
- vulnerability: CVE-2026-27143
package:
name: stdlib
type: go-module
version: go1.18.8
- vulnerability: CVE-2026-27143
package:
name: stdlib
type: go-module
version: go1.26.1
### Npm
- vulnerability: GHSA-phwq-j96m-2c2q
package:
Expand Down
1 change: 1 addition & 0 deletions .margebot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ fastTrack:
- djankovic
- aharwara
- pchiabre
- vthanase
forbiddenTags:
- state::Blocked
ciFailFast: true
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ packages/styles/scss/**/_index.scss
packages/wasm/**/*
tests/account/poms/LoginPage/challenge.html
tests/mail-renderer/tests/**/*.html
tests/mail-renderer/public/**
tests/pass/extension/**/*
tests/pass/hars/**/*

Expand Down
942 changes: 0 additions & 942 deletions .yarn/releases/yarn-4.12.0.cjs

This file was deleted.

940 changes: 940 additions & 0 deletions .yarn/releases/yarn-4.13.0.cjs

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ nodeLinker: node-modules
plugins:
- path: .yarn/plugin-postinstall.js

yarnPath: .yarn/releases/yarn-4.12.0.cjs
yarnPath: .yarn/releases/yarn-4.13.0.cjs

npmPublishRegistry: https://nexus.protontech.ch/repository/web-npm/

Expand All @@ -17,6 +17,12 @@ npmScopes:
npmAuthToken: '${CI_JOB_TOKEN:-}'
proton-meet:
npmRegistryServer: 'https://nexus.protontech.ch/repository/meet-npm/'
proton:
npmRegistryServer: 'https://nexus.protontech.ch/repository/foundation-npm/'

npmPreapprovedPackages:
- '@proton/*'
- '@protontech/*'

npmAuditIgnoreAdvisories:
# Ignore advisories for xlsx package. This package is depended on by a third-party library rowsncolumns (docs)
Expand All @@ -25,3 +31,5 @@ npmAuditIgnoreAdvisories:
- 1108111

compressionLevel: mixed

npmMinimalAgeGate: 3d
17 changes: 17 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ This project is a monorepo hosting the Proton web clients. It includes the web a
- <img src="./applications/pass/src/favicon.svg" style="vertical-align: middle" height="20" width="20" /> <span style="vertical-align: middle; display: inline-block">Proton Pass</span>
- <img src="./applications/wallet/src/favicon.svg" style="vertical-align: middle" height="20" width="20" /> <span style="vertical-align: middle; display: inline-block">Proton Wallet</span>
- <img src="./applications/lumo/src/favicon.svg" style="vertical-align: middle" height="20" width="20" /> <span style="vertical-align: middle; display: inline-block">Proton Lumo</span>
- <img src="./applications/meet/src/favicon.svg" style="vertical-align: middle" height="20" width="20" /> <span style="vertical-align: middle; display: inline-block">Proton Meet</span>

Technically, this monorepo is based on Yarn & Yarn Workspaces, with unified versioning for all packages inside.

Expand Down Expand Up @@ -43,6 +44,22 @@ yarn workspace proton-mail start

For additional details on how to interact with the monorepo, see the [yarn docs](https://yarnpkg.com/) for reference.

## How VPN app differs from the rest

VPN is present in both proton.me and protonvpn.com. However, they are served differently. Some parts of VPN are shared, hosted within `@proton/components` or `@proton/shared`, however, the entry points to them are different.

For protonvpn.com, the entry point comes from `applications/vpn-settings` and for account.proton.me/u/{X}/vpn, the entry point is `applications/account`.

Since both domains are separate, we don't share a local SSO between them. Therefore, we need to serve both applications separately:

```shell
# To serve VPN through vpn-settings
yarn workspace --port 8050 proton-vpn-settings start

# To serve VPN through account
yarn start-all --applications "proton-account"
```

## How to version an application manually

While being on the `main` branch for a clean release.
Expand Down
12 changes: 11 additions & 1 deletion applications/account/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
import { defineConfig } from 'eslint/config';

import config from '@proton/eslint-config-proton/all';

export default config;
export default defineConfig([
config,
{
rules: {
// TODO: Remove this rule once the cycle dependency is fixed
'import/no-cycle': 'off',
},
},
]);
2 changes: 1 addition & 1 deletion applications/account/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = {
moduleDirectories: ['<rootDir>/node_modules', 'node_modules'],
testEnvironment: '@proton/jest-env',
transformIgnorePatterns: [
'node_modules/(?!(@proton/shared|@proton/components|@protontech/telemetry|@protontech/mutex-browser|pmcrypto|openpgp|@openpgp/web-stream-tools|@protontech/bip39|emoji-mart)/)',
'node_modules/(?!(@proton/shared|@proton/components|@protontech/telemetry|@protontech/mutex-browser|pmcrypto|openpgp|@openpgp/web-stream-tools|@protontech/bip39|emoji-mart|@preact/signals-core|@scure/base)/)',
],
transform: {
'^.+\\.(ts|js|mjs)x?$': [
Expand Down
6 changes: 6 additions & 0 deletions applications/account/jest.setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ import '@proton/testing/lib/mockUnleash';
// console.error = () => {};
// console.warn = () => {};

window.ResizeObserver = jest.fn().mockImplementation(() => ({
observe: jest.fn(),
unobserve: jest.fn(),
disconnect: jest.fn(),
}));

// Do not start crypto worker pool, let the single tests setup/mock the CryptoProxy as needed
jest.mock('@proton/shared/lib/helpers/setupCryptoWorker', () => ({
__esModule: true,
Expand Down
2 changes: 1 addition & 1 deletion applications/account/locales/.locale-state.metadata
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"project": "fe-account",
"locale": "640fe4f4810d886da1f34a82ffaf1dd7f303cfee"
"locale": "4bf2a73d6cbe2f452ce6d19bc4398139b930f14d"
}
Loading