1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-21 18:53:29 +00:00
Commit Graph

6324 Commits

Author SHA1 Message Date
Hinton
db59f2791a Merge branch 'master' of github.com:bitwarden/browser into feature/safari-webext
# Conflicts:
#	src/browser/safariApp.ts
#	src/safari/safari/SafariExtensionViewController.swift
#	src/services/browserPlatformUtils.service.ts
2021-01-13 14:21:45 +01:00
Thomas Rittson
078111a4fc Fix formatting and style 2021-01-13 20:10:53 +10:00
Tom Rittson
da636e26c2 add settings -> Excluded Domains component
Provides a UI to edit the domains for which Bitwarden does not offer
to save login details.
2021-01-13 20:10:53 +10:00
addison
b7f8f9899c updated jslib 2021-01-12 18:52:03 -05:00
addison
c41fbac467 Merge branch 'master' into Permissions 2021-01-12 18:51:36 -05:00
Oscar Hinton
7e41e84c7d Merge pull request #1525 from bitwarden/hotfix/action-buttons
Fix action buttons not working when TOTP is not available
2021-01-11 16:28:00 +01:00
Matt Gibson
326b6b3aaf Merge pull request #639 from bitwarden/update-jslib
Update jslib
2021-01-08 12:13:53 -06:00
Matt Gibson
ad1c1cb568 Update jslib (#1526) 2021-01-08 12:13:15 -06:00
Matt Gibson
fa6a8bee2e Update jslib 2021-01-08 08:58:43 -06:00
Hinton
b1e376ce66 Fix action buttons not working when TOTP is not available 2021-01-08 15:48:48 +01:00
Joseph Flinn
509ebe6e91 Merge pull request #7 from joseph-flinn/add-signing-gh
Add signing gh (ignoring the macos build because I don't have those things)
2021-01-06 13:05:18 -08:00
Joseph Flinn
899acaa92a uncommenting some if conditions 2021-01-06 20:45:43 +00:00
Joseph Flinn
54ed6cd2b0 replacing manual dispatch trigger with push/release triggers 2021-01-06 20:39:43 +00:00
Joseph Flinn
92d4afb28d removing appveyor to stop the fork from sending the repo to be built. Testing a release 2021-01-06 20:38:30 +00:00
Joseph Flinn
190fb423da fixing unknown syntax error 2021-01-06 19:46:37 +00:00
Joseph Flinn
b1e4bd4bdb assigning correct type 2021-01-06 19:43:42 +00:00
Joseph Flinn
5eb10afe85 changing over to a value based boolean flag 2021-01-06 19:33:43 +00:00
Joseph Flinn
33029c1684 removing the signing portion of the original workflow 2021-01-06 19:19:18 +00:00
Joseph Flinn
88bf9be15f adding in the flag to the build_and_sign workflow 2021-01-06 18:59:38 +00:00
Joseph Flinn
c508c7cd05 adding a signing flag for electron builder 2021-01-06 18:58:44 +00:00
Joseph Flinn
048f3fed6f adding in the forgotten environment 2021-01-06 18:17:50 +00:00
Joseph Flinn
7a2aa34619 adding the other artifacts to the windows portion of the build 2021-01-06 18:07:22 +00:00
Joseph Flinn
65a13d997a experimenting with no CSC_* env vars 2021-01-06 18:04:18 +00:00
Joseph Flinn
fc28a65e18 Merge pull request #6 from joseph-flinn/add-signing-gh
Add signing gh
2021-01-06 09:28:14 -08:00
Joseph Flinn
e1d2aa4b4a changing the trigger for the Build 2021-01-06 17:25:33 +00:00
Joseph Flinn
ba7007c307 getting the correct artifacts uploaded to github 2021-01-06 16:58:28 +00:00
Oscar Hinton
76a31d089a Merge pull request #1522 from Hinton/hotfix/native-messaging-silent-disconnect
Resolve native messaging silently disconnecting
2021-01-06 16:43:51 +01:00
Vincent Salucci
8af54375f3 [Policy] Personal Ownership banner (#1523)
* Initial commit of ownership banner

* updated capitlization
2021-01-05 17:34:00 -06:00
Vincent Salucci
0fee18bedb Initial commit of ownership banner (#636) 2021-01-05 17:33:40 -06:00
Joseph Flinn
7df3ded62a switching to a cert that should match 2021-01-05 23:10:12 +00:00
Joseph Flinn
902040ec64 making custom signing command easier to read 2021-01-05 22:18:26 +00:00
Joseph Flinn
078862e41b switching over to an npm script 2021-01-05 21:53:46 +00:00
Joseph Flinn
a1a5405722 one last thing before switching over to npm 2021-01-05 21:38:20 +00:00
Joseph Flinn
e31c8c0e79 trying something else 2021-01-05 21:28:27 +00:00
Joseph Flinn
fd89704c1d testing more escapes 2021-01-05 21:17:33 +00:00
Joseph Flinn
fc0e8052b0 trying to escape the quotes with back ticks 2021-01-05 21:03:07 +00:00
Joseph Flinn
38f357c165 trying two single quotes and changing it back to pwsh 2021-01-05 20:50:29 +00:00
Joseph Flinn
0cd63fa400 removing the escape characters 2021-01-05 19:28:00 +00:00
Joseph Flinn
bcc972e60b trying to switch to powershell for the electron-builder task 2021-01-05 19:18:56 +00:00
Joseph Flinn
cf738a2667 adding the npx prefix to the electron-builder program 2021-01-05 19:04:25 +00:00
Chad Scharf
81f3cec707 Merge pull request #637 from bitwarden/gitignore-ignore-dist-safari
Add dist-safari/ to .gitignore
2021-01-05 14:02:16 -05:00
Chad Scharf
fd18bd8db6 Add dist-safari/ to .gitignore 2021-01-05 13:57:31 -05:00
Joseph Flinn
59efc3e091 testing signing with AZ key vault 2021-01-05 18:53:40 +00:00
Joseph Flinn
c6ed8fe1d3 fixing typo 2021-01-05 18:17:58 +00:00
Joseph Flinn
65c5dc1f3b actually installing AST 2021-01-05 18:13:48 +00:00
Joseph Flinn
47b335be4b Merge pull request #5 from joseph-flinn/add-signing-gh
Add signing gh
2021-01-05 10:09:24 -08:00
Joseph Flinn
7712f3e8c3 fixing some whitespace errors 2021-01-05 18:07:53 +00:00
Joseph Flinn
43348c542c trying installing AST 2021-01-05 18:03:23 +00:00
Joseph Flinn
74ba229b21 switching to version 3.1.x instead of 3.x 2021-01-05 17:40:02 +00:00
Joseph Flinn
2a1f75d2bf Merge branch 'add-signing-gh' of github.com:joseph-flinn/desktop into add-signing-gh 2021-01-05 17:23:43 +00:00