Merge upstream branch at bitwarden/web#1
Open
i8degrees wants to merge 284 commits intosyn-net:masterfrom
Open
Conversation
Co-authored-by: github-actions <>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions <>
* Pull in jslib * Bump engines required to node 16 and npm 8 * Bump @types/node to 16 * Modify build.yml to build with node 16 and npm 8 * Update requirements in README.md * Removed step to install npm8 npm8 is included in node v16 * Pull jslib
…#1220) * [chore] updated services.module to use account services * [refactor] sorted services provided by services.module * [chore] removed references to deleted jslib services * [chore] used activeAccount over storageService for account level storage items * [chore] resolved linter warnings * Refactor activeAccountService to stateService * [bug] Remove uneeded calls to state service on logout This was causing console erros on logout. Clearing of data is handled fully in dedicated services, clearing them in state afterwards is essentially a redundant call. * [bug] Add back null locked callback to VaultTimeoutService * Move call to get showUpdateKey * [bug] Ensure HtmlStorageService does not override StateService options and locations * [bug] Adjust theme logic to pull from the new storage locations * [bug] Correct theme not sticking on refresh * [bug] Add enableFullWidth to the account model * [bug] fix theme option empty when light is selected * [bug] init state on application start * [bug] Reinit state when coming back from a lock * [style] Fix lint complaints * [bug] Clean state on logout * [chore] Resolved merge issues * [bug] Correct default for enableGravitars * Bump angular to 12. * Remove angular.json * Bump rxjs * Fix build errors, remove file-loader with asset/resource * Use contenthash * Bump jslib * Bump ngx-toastr * [chore] resolve issues from merge * [chore] resolve issues from merge * [bug] Add missing bracket * Use newer import syntax * [bug] Correct service orge * [style] Fix lint complaints * [chore] update jslib * [review] Address code review * [review] Address code review * [review] Rename providerService to webProviderService Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com> Co-authored-by: Hinton <oscar@oscarhinton.com>
* [bug] Correct bad BroadcasterService import * [chore] update jslib
Co-authored-by: github-actions <>
* move sso properties in jslib to globalstate * update jslib * update jslib with prettier changes
…ignore as well. (#1352) * Added inputs for reruns * Added github workflows to .prettierignore * Moved the Redeploy logic into the setup job
Co-authored-by: Hinton <oscar@oscarhinton.com>
Co-authored-by: github-actions <>
* [bug(Account Switching)] Allow for never lock for dev setups * [chore] Remove unecassary import * [style] Ran prettier * [chore] Update jslib
Co-authored-by: github-actions <>
* [bug] Add state defaults for vault timeout * [chore] Update jslib
* Add logic for falling back to the users vault * Update error message * Add jira ticket
* [fix] Remove function implementation that was moved to jslib * [dep] Update jslib
* Make spacing match other rows in vault filter * Add spaces in headings
* Add `Organization_SponsorshipsSynced` event type. Update events display to handle events triggered by installations rather than users * Update jslib
- removed comma from footer files Co-authored-by: André Bispo <abispo@bitwarden.com>
* removed accented character from serach input field * updated jslib
…1703) * switch in-line plus add org button to more explicit version * Add spaces to line up text better
* Update Key Connector error message * Update jslib
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Updating the version check to the new Github action * Update .github/workflows/release.yml Co-authored-by: Micaiah Martin <77340197+mimartin12@users.noreply.github.com> * switching action branch tag to commit tag Co-authored-by: Micaiah Martin <77340197+mimartin12@users.noreply.github.com>
* fixing dumb issue * Fixing another dumb mistake
Help center document linked is for the Provider Portal; this modal is for Organization Users. Correcting link to help docs.
* Make enrollment a modal component * Add verification to org user module * Move enroll to component * Update warning for modal * update jslib * Use ModalRef to close the modal * Use bit-button
* Allow firefox relay service in generator * Update generator.component.ts * Update generator.component.ts * make pretty
* [fix] Pull org admin vault collections directly from the API * [refactor] Establish pattern for interfaces in module scoped services * [fix] Remove access modifiers from constructor params for an extended service * [fix] Rename skipFilterCollectionRefresh to firstLoaded * [fix] Simplify hiding unwanted filters in the org vault * Revert "[refactor] Establish pattern for interfaces in module scoped services" This reverts commit f1edae5. * Update src/app/modules/vault-filter/vault-filter.component.ts Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * Update src/app/modules/vault-filter/organization-vault-filter.component.ts Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * [fix] Ran prettier Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.