From 7faf75a69a14cb3e4530c01289f7cc26044476bf Mon Sep 17 00:00:00 2001 From: Addison Beck Date: Fri, 13 Nov 2020 13:31:21 -0500 Subject: [PATCH 1/4] version bump (#588) * version bump * also reset the patch version --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index c46773959c..98ad04bf4e 100644 --- a/src/package.json +++ b/src/package.json @@ -2,7 +2,7 @@ "name": "bitwarden", "productName": "Bitwarden", "description": "A secure and free password manager for all of your devices.", - "version": "1.22.2", + "version": "1.23.0", "author": "Bitwarden Inc. (https://bitwarden.com)", "homepage": "https://bitwarden.com", "license": "GPL-3.0", From 0670970d2e6ec399214958a615365348367103fa Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sat, 14 Nov 2020 23:06:05 -0500 Subject: [PATCH 2/4] change snap push to upload --- scripts/snap-update.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/snap-update.ps1 b/scripts/snap-update.ps1 index c312b3ccc6..095c61a393 100644 --- a/scripts/snap-update.ps1 +++ b/scripts/snap-update.ps1 @@ -25,4 +25,4 @@ $uri = "https://github.com/bitwarden/desktop/releases/download/v" + $version + " [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 Invoke-RestMethod -Uri $uri -OutFile $distSnap -snapcraft push $distSnap --release stable +snapcraft upload $distSnap --release stable From a18a35fa0b3dfe8eeee8fa4d3a2200957502f952 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 18 Nov 2020 16:13:05 -0500 Subject: [PATCH 3/4] support for sr lang. resolve sendService deps (#593) --- jslib | 2 +- src/app/app.module.ts | 2 ++ src/app/services.module.ts | 7 ++++++- src/services/i18n.service.ts | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/jslib b/jslib index 9aa3cbf73d..f44e99d74d 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 9aa3cbf73d9df9a2641654270911359593bcb5c5 +Subproject commit f44e99d74dc011c026525d171f7d2940b60b6587 diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 149cd5934c..17854135e9 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -90,6 +90,7 @@ import localePtBr from '@angular/common/locales/pt'; import localePtPt from '@angular/common/locales/pt-PT'; import localeRo from '@angular/common/locales/ro'; import localeRu from '@angular/common/locales/ru'; +import localeSr from '@angular/common/locales/sr'; import localeSk from '@angular/common/locales/sk'; import localeSv from '@angular/common/locales/sv'; import localeTh from '@angular/common/locales/th'; @@ -127,6 +128,7 @@ registerLocaleData(localePtPt, 'pt-PT'); registerLocaleData(localeRo, 'ro'); registerLocaleData(localeRu, 'ru'); registerLocaleData(localeSk, 'sk'); +registerLocaleData(localeSr, 'sr'); registerLocaleData(localeSv, 'sv'); registerLocaleData(localeTh, 'th'); registerLocaleData(localeTr, 'tr'); diff --git a/src/app/services.module.ts b/src/app/services.module.ts index 5890705f18..bc59bd8655 100644 --- a/src/app/services.module.ts +++ b/src/app/services.module.ts @@ -42,6 +42,7 @@ import { NotificationsService } from 'jslib/services/notifications.service'; import { PasswordGenerationService } from 'jslib/services/passwordGeneration.service'; import { PolicyService } from 'jslib/services/policy.service'; import { SearchService } from 'jslib/services/search.service'; +import { SendService } from 'jslib/services/send.service'; import { SettingsService } from 'jslib/services/settings.service'; import { StateService } from 'jslib/services/state.service'; import { SyncService } from 'jslib/services/sync.service'; @@ -74,6 +75,7 @@ import { import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from 'jslib/abstractions/platformUtils.service'; import { PolicyService as PolicyServiceAbstraction } from 'jslib/abstractions/policy.service'; import { SearchService as SearchServiceAbstraction } from 'jslib/abstractions/search.service'; +import { SendService as SendServiceAbstraction } from 'jslib/abstractions/send.service'; import { SettingsService as SettingsServiceAbstraction } from 'jslib/abstractions/settings.service'; import { StateService as StateServiceAbstraction } from 'jslib/abstractions/state.service'; import { StorageService as StorageServiceAbstraction } from 'jslib/abstractions/storage.service'; @@ -108,13 +110,15 @@ const folderService = new FolderService(cryptoService, userService, apiService, i18nService, cipherService); const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService); searchService = new SearchService(cipherService); +const sendService = new SendService(cryptoService, userService, apiService, storageService, + i18nService, cryptoFunctionService); const policyService = new PolicyService(userService, storageService); const vaultTimeoutService = new VaultTimeoutService(cipherService, folderService, collectionService, cryptoService, platformUtilsService, storageService, messagingService, searchService, userService, tokenService, null, async () => messagingService.send('logout', { expired: false })); const syncService = new SyncService(userService, apiService, settingsService, folderService, cipherService, cryptoService, collectionService, storageService, messagingService, policyService, - async (expired: boolean) => messagingService.send('logout', { expired: expired })); + sendService, async (expired: boolean) => messagingService.send('logout', { expired: expired })); const passwordGenerationService = new PasswordGenerationService(cryptoService, storageService, policyService); const totpService = new TotpService(storageService, cryptoFunctionService); const containerService = new ContainerService(cryptoService); @@ -210,6 +214,7 @@ export function initFactory(): Function { { provide: SystemServiceAbstraction, useValue: systemService }, { provide: EventServiceAbstraction, useValue: eventService }, { provide: PolicyServiceAbstraction, useValue: policyService }, + { provide: SendServiceAbstraction, useValue: sendService }, { provide: CryptoFunctionServiceAbstraction, useValue: cryptoFunctionService }, { provide: APP_INITIALIZER, diff --git a/src/services/i18n.service.ts b/src/services/i18n.service.ts index a09c8427ac..f894557cbe 100644 --- a/src/services/i18n.service.ts +++ b/src/services/i18n.service.ts @@ -14,8 +14,8 @@ export class I18nService extends BaseI18nService { this.supportedTranslationLocales = [ 'en', 'be', 'bg', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'es', 'et', 'fa', 'fi', 'fr', 'hr', 'hu', 'id', - 'it', 'ja', 'ko', 'ml', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr', 'uk', 'vi', - 'zh-CN', 'zh-TW', + 'it', 'ja', 'ko', 'ml', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'sk', 'sr', 'sv', 'th', 'tr', 'uk', + 'vi', 'zh-CN', 'zh-TW', ]; } } From f7b5968298e459cc5a59bb8a62f7a34c7b837f22 Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Thu, 19 Nov 2020 10:39:23 -0600 Subject: [PATCH 4/4] Use mobile's trash message for item delete --- src/locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index ae5684f6d7..926fa34b65 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -340,7 +340,7 @@ "message": "Delete Attachment" }, "deleteItemConfirmation": { - "message": "Are you sure you want to delete this item?" + "message": "Do you really want to send to the trash?" }, "deletedItem": { "message": "Sent item to trash"