Oscar Hinton
|
ea3316742c
|
Bump version to 1.26.5 (#938)
|
2021-06-02 18:09:20 +02:00 |
|
Thomas Rittson
|
6edd600006
|
Move theme update logic to services.module.ts
|
2021-06-02 07:28:21 +10:00 |
|
Tom Rittson
|
b00df0112e
|
Let all OS' use system theme on startup
|
2021-05-31 14:34:59 +10:00 |
|
Thomas Rittson
|
7f5a5a5fbb
|
Only update to system theme if theme is Default
|
2021-05-31 14:34:59 +10:00 |
|
Thomas Rittson
|
c225210a44
|
Respond to native OS theme changes
|
2021-05-31 14:34:53 +10:00 |
|
Oscar Hinton
|
c7345197f7
|
Password reprompt fixes (#926)
* Hide card number when hidden
* Avoid double password prompts
* Bump jslib
|
2021-05-28 20:08:44 +02:00 |
|
Thomas Rittson
|
f5175564b3
|
Version bump to 1.26.4
|
2021-05-21 08:59:07 +10:00 |
|
Vince Grassia
|
c9ae2ed933
|
Update ME lang import to proper order
|
2021-05-17 16:25:57 -04:00 |
|
Vince Grassia
|
6f6de60509
|
Fix locale import typo
|
2021-05-17 16:24:11 -04:00 |
|
Daniel James Smith
|
cae76cd74a
|
Fixed locale import for Montenegrin (Latin)
|
2021-05-17 18:01:44 +02:00 |
|
Trey Greer
|
cc165420f7
|
Update src/services/i18n.service.ts
Co-authored-by: Chad Scharf <3904944+cscharf@users.noreply.github.com>
|
2021-05-14 18:19:45 -04:00 |
|
tgreer-bw
|
a24618be32
|
add missing languages from Crowdin
|
2021-05-14 16:42:12 -04:00 |
|
Kyle Spearrin
|
0d5d8b671d
|
use swal titletext to avoid XSS (#884)
|
2021-05-13 15:22:52 -04:00 |
|
Thomas Rittson
|
68096c1f12
|
update service deps
|
2021-05-13 10:53:38 +10:00 |
|
Chad Scharf
|
ee1f31d300
|
Version bump 1.26.3
|
2021-05-12 17:57:23 -04:00 |
|
Chad Scharf
|
dd683e8dad
|
Merge branch 'master' of https://github.com/bitwarden/desktop into master
|
2021-05-12 16:53:19 -04:00 |
|
Chad Scharf
|
2bf9f34472
|
Version bump 1.26.2
|
2021-05-12 16:53:17 -04:00 |
|
Oscar Hinton
|
8f7ab9f8db
|
Bump node to 14 (#869)
* Bump node to 14
* Bump some dependencies
* Bump jslib
* Ensure compatability with latest jslib
* Change node engine to ~14.
|
2021-05-12 22:38:02 +02:00 |
|
Chad Scharf
|
7d53ff788f
|
Version bump to 1.26.1
|
2021-05-12 15:54:14 -04:00 |
|
Daniel James Smith
|
00781806f5
|
Fix typo in webAuthnAuthenticate
|
2021-05-11 21:04:18 +02:00 |
|
Kyle Spearrin
|
23e20ae0a3
|
New translations messages.json (English, India)
|
2021-05-11 13:47:37 -04:00 |
|
Kyle Spearrin
|
608505f9e6
|
New translations messages.json (Russian)
|
2021-05-11 13:47:36 -04:00 |
|
Kyle Spearrin
|
dc3c33abad
|
New translations messages.json (Portuguese)
|
2021-05-11 13:47:35 -04:00 |
|
Kyle Spearrin
|
2d022773ad
|
New translations messages.json (Polish)
|
2021-05-11 13:47:34 -04:00 |
|
Kyle Spearrin
|
69f4782e46
|
New translations messages.json (Dutch)
|
2021-05-11 13:47:32 -04:00 |
|
Kyle Spearrin
|
c9b9bd6ea5
|
New translations messages.json (Korean)
|
2021-05-11 13:47:31 -04:00 |
|
Kyle Spearrin
|
045e7b7001
|
New translations messages.json (Japanese)
|
2021-05-11 13:47:30 -04:00 |
|
Kyle Spearrin
|
728b4e06f5
|
New translations messages.json (Italian)
|
2021-05-11 13:47:29 -04:00 |
|
Kyle Spearrin
|
c9af991027
|
New translations messages.json (Hungarian)
|
2021-05-11 13:47:27 -04:00 |
|
Kyle Spearrin
|
4301f5d881
|
New translations messages.json (Hebrew)
|
2021-05-11 13:47:26 -04:00 |
|
Kyle Spearrin
|
8b6d0a8a07
|
New translations messages.json (Slovak)
|
2021-05-11 13:47:25 -04:00 |
|
Kyle Spearrin
|
5581ec6aa1
|
New translations messages.json (Finnish)
|
2021-05-11 13:47:23 -04:00 |
|
Kyle Spearrin
|
b143010486
|
New translations messages.json (German)
|
2021-05-11 13:47:22 -04:00 |
|
Kyle Spearrin
|
3a907bf3fa
|
New translations messages.json (Danish)
|
2021-05-11 13:47:21 -04:00 |
|
Kyle Spearrin
|
79187c5782
|
New translations messages.json (Czech)
|
2021-05-11 13:47:20 -04:00 |
|
Kyle Spearrin
|
6a89651588
|
New translations messages.json (Catalan)
|
2021-05-11 13:47:18 -04:00 |
|
Kyle Spearrin
|
08a9a81992
|
New translations messages.json (Bulgarian)
|
2021-05-11 13:47:17 -04:00 |
|
Kyle Spearrin
|
9701fa9736
|
New translations messages.json (Belarusian)
|
2021-05-11 13:47:16 -04:00 |
|
Kyle Spearrin
|
765ef26340
|
New translations messages.json (Afrikaans)
|
2021-05-11 13:47:14 -04:00 |
|
Kyle Spearrin
|
3c83c14bb8
|
New translations messages.json (Spanish)
|
2021-05-11 13:47:13 -04:00 |
|
Kyle Spearrin
|
0ca036b968
|
New translations messages.json (Greek)
|
2021-05-11 13:47:12 -04:00 |
|
Kyle Spearrin
|
157dfabaae
|
New translations messages.json (French)
|
2021-05-11 13:47:11 -04:00 |
|
Kyle Spearrin
|
f82d900cc2
|
New translations messages.json (Slovenian)
|
2021-05-11 13:47:09 -04:00 |
|
Kyle Spearrin
|
444511152c
|
New translations messages.json (Swedish)
|
2021-05-11 13:47:08 -04:00 |
|
Kyle Spearrin
|
9b294bf4dd
|
New translations messages.json (Montenegrin (Latin))
|
2021-05-11 13:47:07 -04:00 |
|
Kyle Spearrin
|
035d6ee5b3
|
New translations messages.json (Norwegian Bokmal)
|
2021-05-11 13:47:05 -04:00 |
|
Kyle Spearrin
|
f024b33e02
|
New translations messages.json (Sinhala)
|
2021-05-11 13:47:03 -04:00 |
|
Kyle Spearrin
|
d3bb87ccb7
|
New translations messages.json (Malayalam)
|
2021-05-11 13:47:02 -04:00 |
|
Kyle Spearrin
|
57f8176aac
|
New translations messages.json (Esperanto)
|
2021-05-11 13:47:01 -04:00 |
|
Kyle Spearrin
|
fb4cb327ab
|
New translations messages.json (English, United Kingdom)
|
2021-05-11 13:46:59 -04:00 |
|
Kyle Spearrin
|
64cee80521
|
New translations messages.json (Latvian)
|
2021-05-11 13:46:58 -04:00 |
|
Kyle Spearrin
|
cb73582038
|
New translations messages.json (Estonian)
|
2021-05-11 13:46:57 -04:00 |
|
Kyle Spearrin
|
203c44bace
|
New translations messages.json (Croatian)
|
2021-05-11 13:46:56 -04:00 |
|
Kyle Spearrin
|
19e09243fb
|
New translations messages.json (Serbian (Cyrillic))
|
2021-05-11 13:46:55 -04:00 |
|
Kyle Spearrin
|
e8e888698d
|
New translations messages.json (Thai)
|
2021-05-11 13:46:54 -04:00 |
|
Kyle Spearrin
|
6b1c15519d
|
New translations messages.json (Persian)
|
2021-05-11 13:46:52 -04:00 |
|
Kyle Spearrin
|
2402a6f4c6
|
New translations messages.json (Indonesian)
|
2021-05-11 13:46:51 -04:00 |
|
Kyle Spearrin
|
6f92b55f40
|
New translations messages.json (Portuguese, Brazilian)
|
2021-05-11 13:46:50 -04:00 |
|
Kyle Spearrin
|
2992a31b61
|
New translations messages.json (Vietnamese)
|
2021-05-11 13:46:48 -04:00 |
|
Kyle Spearrin
|
061996bf55
|
New translations messages.json (Chinese Traditional)
|
2021-05-11 13:46:47 -04:00 |
|
Kyle Spearrin
|
0a288899e7
|
New translations messages.json (Chinese Simplified)
|
2021-05-11 13:46:46 -04:00 |
|
Kyle Spearrin
|
da8697ea94
|
New translations messages.json (Ukrainian)
|
2021-05-11 13:46:44 -04:00 |
|
Kyle Spearrin
|
d5e5dfc1d5
|
New translations messages.json (Turkish)
|
2021-05-11 13:46:43 -04:00 |
|
Kyle Spearrin
|
21a3c4357a
|
New translations messages.json (Bengali)
|
2021-05-11 13:46:42 -04:00 |
|
Kyle Spearrin
|
5db26cbcc6
|
New translations messages.json (Romanian)
|
2021-05-11 13:46:41 -04:00 |
|
Oscar Hinton
|
af5898a001
|
Add setting for disabling auto prompt of biometrics (#873)
* Add setting for disabling auto prompt of biometrics
* Ensure window is visible before prompting for biometrics
|
2021-05-06 20:19:48 +02:00 |
|
Oscar Hinton
|
a712917f47
|
Fix VS code ts language server no longer working after #866 (#872)
|
2021-05-06 16:45:27 +02:00 |
|
Oscar Hinton
|
266f089b3e
|
Cleanup tsconfig (#866)
* Simplify tsconfig
* Add separate tsconfig for renderer to get rid of last warnings
|
2021-05-05 09:47:35 +02:00 |
|
Oscar Hinton
|
2bdd7413aa
|
Block save button when uploading a send (#871)
* Block save button when uploading a send
* Add overflow hidden to prevent scrollbar appearing
|
2021-05-04 23:36:57 +02:00 |
|
Chad Scharf
|
3a342be095
|
Merge pull request #870 from gryffs/box-content-flex
Add flexbox to cipher list to correct display center issue.
|
2021-05-04 16:05:26 -04:00 |
|
Oscar Hinton
|
42564285d9
|
Password reprompt (#838)
* Add support for password reprompt
|
2021-05-04 21:32:03 +02:00 |
|
Chad Griffis
|
49748ee05a
|
Replace single quote with double quotes in HTML and use div in place of a element.
|
2021-05-03 23:31:45 +08:00 |
|
Chad Griffis
|
0c12367721
|
Add flexbox to cipher list to correct display center issue.
|
2021-05-03 17:17:19 +08:00 |
|
Oscar Hinton
|
20b8a83dd8
|
Disconnect active connections when closing native messaging. Fix exe path on windows (#865)
|
2021-05-03 09:59:40 +02:00 |
|
Thomas Rittson
|
163fa2aa41
|
Merge pull request #851 from gryffs/prompt-trigger-apwd
Implement the markAsDirty form controls for AddEditComponent(#761)
Prevents add-edit page from closing if new password has been generated
|
2021-05-03 07:45:03 +10:00 |
|
Chad Griffis
|
7bed3b0b59
|
Update a formatting issue with markPasswordAsDirty
|
2021-05-01 16:44:40 +08:00 |
|
Oscar Hinton
|
418625682a
|
Write native messaging manifests for Chromium (#862)
|
2021-04-29 16:12:57 +02:00 |
|
Thomas Rittson
|
eb1c5f809a
|
Merge pull request #853 from bitwarden/fix-biometric-button
Don't submit form when unlocking with biometrics
|
2021-04-26 08:35:08 +10:00 |
|
Oscar Hinton
|
e6e79917f7
|
Bump dependencies (#848)
* Bump dependencies
|
2021-04-23 10:45:30 +02:00 |
|
Tom Rittson
|
cf29c35e07
|
Don't submit form when unlocking with biometrics
|
2021-04-23 10:58:44 +10:00 |
|
Oscar Hinton
|
6dc82a8707
|
Change unlock biometric button to be selectable using tab (#846)
|
2021-04-22 20:00:05 +02:00 |
|
Vincent Salucci
|
227a1eaff9
|
[Version] Bump to 1.26.0 (#852)
|
2021-04-22 12:13:17 -05:00 |
|
Chad Griffis
|
06f2364733
|
Implement the markAsDirty form controls for AddEditComponent(#761).
|
2021-04-22 23:24:59 +08:00 |
|
Matt Gibson
|
42636d3d2e
|
Update view DI
|
2021-04-22 08:28:47 -05:00 |
|
Thomas Rittson
|
d7e1fda17d
|
Fix linting
|
2021-04-22 07:56:19 +10:00 |
|
Thomas Rittson
|
62ccf420a2
|
Add guards to lock and login routes
|
2021-04-22 07:56:19 +10:00 |
|
Thomas Rittson
|
0724041daf
|
Don't use tokenService to manage emailVerified (#841)
* Update send add-edit component dependencies
* bump jslib
|
2021-04-15 10:29:26 +02:00 |
|
Oscar Hinton
|
6acfba4b40
|
Remove dead code (#839)
* Remove last remnants of old analytics code
|
2021-04-14 23:43:22 +02:00 |
|
Thomas Rittson
|
30793a0d9b
|
Merge branch 'master' into verify-email-for-send
|
2021-04-09 15:41:49 +10:00 |
|
Oscar Hinton
|
eebd4fc9d9
|
Remove electron remote (#830)
* Remove calls to remote
|
2021-04-07 20:25:15 +02:00 |
|
Thomas Rittson
|
05183149ad
|
Fix linting
|
2021-04-07 13:11:45 +10:00 |
|
Thomas Rittson
|
bc543de307
|
Require user to verify email to use file Send
|
2021-04-07 12:47:50 +10:00 |
|
Thomas Rittson
|
43f511a711
|
Fix Premium Required message after sso auth
|
2021-03-31 14:14:52 +10:00 |
|
Matt Gibson
|
99f8fdb4e9
|
Use file upload service for file uploads
|
2021-03-29 08:24:00 -05:00 |
|
Thomas Rittson
|
0fabda65e7
|
Merge pull request #812 from bitwarden/send-hide-email
Hide email address in Sends
|
2021-03-29 07:58:25 +10:00 |
|
addison
|
500f6264a6
|
updated service params
|
2021-03-26 15:06:48 -04:00 |
|
Oscar Hinton
|
b5492e9546
|
Simplify logic for resolving path to exe for native messaging (#814)
|
2021-03-25 23:11:31 +01:00 |
|
Thomas Rittson
|
f3ae6ed1e2
|
Add "hide email" option for Send
|
2021-03-25 15:29:49 +10:00 |
|
Matt Gibson
|
2a0ab87be0
|
Update jslib
|
2021-03-24 11:17:20 -05:00 |
|
Oscar Hinton
|
64da326be3
|
Attempt to create NativeMessagingHosts directory if not already exist (#808)
|
2021-03-23 23:35:25 +01:00 |
|
Oscar Hinton
|
85f29e1222
|
Write native messaging manifests for Chrome/edge beta/dev/canary (#804)
|
2021-03-22 22:16:02 +01:00 |
|
Hinton
|
c2e8e07002
|
Fix edge case where tmp directory doesn't exist in home dir on mac.
|
2021-03-18 21:33:14 +01:00 |
|
Chad Scharf
|
aefd292898
|
Merge pull request #791 from bitwarden/version-bump-1.25.1
Version bump to 1.25.1
|
2021-03-17 17:17:37 -04:00 |
|
Oscar Hinton
|
a3e7bab76a
|
Merge pull request #750 from bitwarden/feature/webauthn
|
2021-03-17 22:14:14 +01:00 |
|
Chad Scharf
|
a0903a0932
|
Version bump to 1.25.1
|
2021-03-17 13:38:25 -04:00 |
|
aimuz
|
444a06d6f7
|
support vivaldi for macos
|
2021-03-16 17:00:27 +08:00 |
|
Hinton
|
edc531e105
|
Merge branch 'master' of https://github.com/bitwarden/desktop into feature/webauthn
|
2021-03-15 16:23:52 +01:00 |
|
Kyle Spearrin
|
0e1dab40cc
|
style tweaks to send add/edit page (#767)
* style tweaks to send add/edit page
* remove redundant conditional
|
2021-03-12 14:37:52 -05:00 |
|
Kyle Spearrin
|
cc29fa2af3
|
New translations messages.json (Catalan)
|
2021-03-11 13:54:04 -05:00 |
|
Kyle Spearrin
|
92377be73c
|
New translations messages.json (German)
|
2021-03-11 13:54:03 -05:00 |
|
Kyle Spearrin
|
8927df54c4
|
New translations messages.json (Finnish)
|
2021-03-11 13:54:01 -05:00 |
|
Kyle Spearrin
|
8a2a1efef7
|
New translations messages.json (Hungarian)
|
2021-03-11 13:54:00 -05:00 |
|
Kyle Spearrin
|
f860263ff2
|
New translations messages.json (Italian)
|
2021-03-11 13:53:58 -05:00 |
|
Kyle Spearrin
|
dd57259beb
|
New translations messages.json (Japanese)
|
2021-03-11 13:53:57 -05:00 |
|
Kyle Spearrin
|
1420c9f58f
|
New translations messages.json (Korean)
|
2021-03-11 13:53:55 -05:00 |
|
Kyle Spearrin
|
d5a0b30108
|
New translations messages.json (Dutch)
|
2021-03-11 13:53:54 -05:00 |
|
Kyle Spearrin
|
a2bd951371
|
New translations messages.json (Polish)
|
2021-03-11 13:53:53 -05:00 |
|
Kyle Spearrin
|
ec3d8659b8
|
New translations messages.json (Belarusian)
|
2021-03-11 13:53:51 -05:00 |
|
Kyle Spearrin
|
418bc35d84
|
New translations messages.json (Russian)
|
2021-03-11 13:53:50 -05:00 |
|
Kyle Spearrin
|
c9b10a5f8f
|
New translations messages.json (Serbian (Cyrillic))
|
2021-03-11 13:53:48 -05:00 |
|
Kyle Spearrin
|
a7355871b9
|
New translations messages.json (Ukrainian)
|
2021-03-11 13:53:47 -05:00 |
|
Kyle Spearrin
|
468dde79ac
|
New translations messages.json (Chinese Simplified)
|
2021-03-11 13:53:46 -05:00 |
|
Kyle Spearrin
|
d6a6ce6368
|
New translations messages.json (Chinese Traditional)
|
2021-03-11 13:53:44 -05:00 |
|
Kyle Spearrin
|
0313ca7acc
|
New translations messages.json (Portuguese, Brazilian)
|
2021-03-11 13:53:43 -05:00 |
|
Kyle Spearrin
|
0995da1fd3
|
New translations messages.json (Persian)
|
2021-03-11 13:53:41 -05:00 |
|
Kyle Spearrin
|
a08b6d4b5e
|
New translations messages.json (Estonian)
|
2021-03-11 13:53:39 -05:00 |
|
Kyle Spearrin
|
3e422536b8
|
New translations messages.json (Latvian)
|
2021-03-11 13:53:38 -05:00 |
|
Kyle Spearrin
|
34af94bd5d
|
New translations messages.json (Slovak)
|
2021-03-11 13:53:36 -05:00 |
|
Kyle Spearrin
|
53944c58bd
|
New translations messages.json (Romanian)
|
2021-03-11 13:53:34 -05:00 |
|
Chad Scharf
|
1c2c444518
|
Merge pull request #765 from bitwarden/version-bump
Minor release version bump to 1.25.0
|
2021-03-10 12:07:32 -05:00 |
|
Chad Scharf
|
ab24604d18
|
fix lint errors - trailing whitespace
|
2021-03-10 10:45:56 -05:00 |
|
Chad Scharf
|
96e8d712ce
|
Merge pull request #757 from aimuz/patch-1
fix: Edge supported by biometrics
|
2021-03-10 10:20:06 -05:00 |
|
Thomas Rittson
|
bdc2f288ec
|
Minor release version bump to 1.25.0
|
2021-03-10 08:59:55 +10:00 |
|
addison
|
9aaa9a0fdb
|
added file size to Send view
|
2021-03-09 14:30:30 -05:00 |
|
Kyle Spearrin
|
9310f7d202
|
New Crowdin updates (#763)
* New translations messages.json (French)
* New translations messages.json (German)
* New translations messages.json (Japanese)
* New translations messages.json (Serbian (Cyrillic))
* New translations messages.json (Persian)
|
2021-03-09 13:19:15 -05:00 |
|
Kyle Spearrin
|
8deedbfe20
|
New Crowdin updates (#762)
* New translations messages.json (Romanian)
* New translations messages.json (Bengali)
* New translations messages.json (Turkish)
* New translations messages.json (Ukrainian)
* New translations messages.json (Chinese Simplified)
* New translations messages.json (Chinese Traditional)
* New translations messages.json (Vietnamese)
* New translations messages.json (Portuguese, Brazilian)
* New translations messages.json (Indonesian)
* New translations messages.json (Persian)
* New translations messages.json (Thai)
* New translations messages.json (Serbian (Cyrillic))
* New translations messages.json (Croatian)
* New translations messages.json (Estonian)
* New translations messages.json (Latvian)
* New translations messages.json (English, United Kingdom)
* New translations messages.json (Esperanto)
* New translations messages.json (Malayalam)
* New translations messages.json (Sinhala)
* New translations messages.json (Norwegian Bokmal)
* New translations messages.json (Montenegrin (Latin))
* New translations messages.json (Swedish)
* New translations messages.json (Slovenian)
* New translations messages.json (French)
* New translations messages.json (Greek)
* New translations messages.json (Spanish)
* New translations messages.json (Afrikaans)
* New translations messages.json (Belarusian)
* New translations messages.json (Bulgarian)
* New translations messages.json (Catalan)
* New translations messages.json (Czech)
* New translations messages.json (Danish)
* New translations messages.json (German)
* New translations messages.json (Finnish)
* New translations messages.json (Slovak)
* New translations messages.json (Hebrew)
* New translations messages.json (Hungarian)
* New translations messages.json (Italian)
* New translations messages.json (Japanese)
* New translations messages.json (Korean)
* New translations messages.json (Dutch)
* New translations messages.json (Polish)
* New translations messages.json (Portuguese)
* New translations messages.json (Russian)
* New translations messages.json (English, India)
|
2021-03-09 11:48:44 -05:00 |
|
aimuz
|
0a56bcb5c9
|
fix: Edge supported by biometrics
|
2021-03-09 09:49:45 +08:00 |
|
addison
|
5724875328
|
fixed icon redirect bug on Sends
|
2021-03-08 15:19:08 -05:00 |
|
Hinton
|
862f9a5a63
|
Update to use the new WebAuthn iframe
|
2021-03-08 19:12:56 +01:00 |
|
Thomas Rittson
|
7f04d8e952
|
Add extra encrypted export warnings
|
2021-03-05 07:53:35 +10:00 |
|
Hinton
|
907fabdd8e
|
Remove allow from html since it's moved to js
|
2021-03-04 22:36:17 +01:00 |
|
Hinton
|
b7889b15ff
|
Add support for WebAuthn
|
2021-03-04 20:19:59 +01:00 |
|
Addison Beck
|
b8de7d2619
|
Merge pull request #735 from bitwarden/SendBadges
Send badges
|
2021-02-25 16:57:03 -05:00 |
|
addison
|
c620c419d7
|
missing *
|
2021-02-25 13:33:56 -05:00 |
|
addison
|
ac4afc6ef1
|
changed disabled badge style
|
2021-02-25 13:27:47 -05:00 |
|
addison
|
f429996d5c
|
added status badges to Send
|
2021-02-25 13:12:47 -05:00 |
|
Daniel James Smith
|
8207d86df5
|
Fixes #723
Change the link for fileBugReport to point to https://github.com/bitwarden/desktop/issues
|
2021-02-24 20:07:36 +01:00 |
|
addison
|
077b4b8de5
|
updated disableSend implementations
|
2021-02-23 10:40:44 -05:00 |
|
addison
|
696fddc970
|
label-hack change
|
2021-02-22 15:06:18 -05:00 |
|
addison
|
f6fb4fee29
|
refactor
|
2021-02-22 15:00:19 -05:00 |
|