Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[AC-1119] [PM-1923] [AC-701] Import into a specified folder or collection #5683

Merged
merged 51 commits into from
Aug 4, 2023
Merged

[AC-1119] [PM-1923] [AC-701] Import into a specified folder or collection #5683

Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
8495344
Migrate callouts to the CL ones
djsmith85 Jun 14, 2023
b93d0df
Add folder/collection selection
djsmith85 Jun 14, 2023
1568910
Use bitTypography as page header/title
djsmith85 Jun 20, 2023
7f3ebdc
Migrate submit button to CL
djsmith85 Jun 20, 2023
4cb99c8
Migrate fileSelector and fileContents
djsmith85 Jun 20, 2023
e7e868b
Add ability to import into an existing folder/collection
djsmith85 Jun 21, 2023
f4423c9
Added vault selector, folders/collections selection logic and compone…
aj-rosado Jun 21, 2023
7305484
Revert changes to the already migrated CL fileSelector, fileContents …
aj-rosado Jun 21, 2023
975e8e9
Fix fileContents input and spacing to submit button
djsmith85 Jun 21, 2023
ff4a901
Use id's instead of name for tghe targetSelector
djsmith85 Jun 21, 2023
da264f6
Remove unneeded empty line
djsmith85 Jun 21, 2023
b84098c
Fix import into existing folder/collection
djsmith85 Jun 21, 2023
09b969e
Added CL to fileSelector and fileInput on vault import
aj-rosado Jun 22, 2023
ad60102
Added reactive forms and new selector logic to import vault
aj-rosado Jun 22, 2023
4a24ee2
Merge branch 'AC-1119-flexible-collections-import-page' of https://gi…
aj-rosado Jun 22, 2023
d55294e
Added new texts on Import Vault
aj-rosado Jun 22, 2023
e804617
Corrected logic on enable targetSelector
aj-rosado Jun 22, 2023
402cbcd
Merge branch 'AC-1119-flexible-collections-import-page' of https://gi…
djsmith85 Jun 22, 2023
fe49eb9
Removing target selector from being required
aj-rosado Jun 22, 2023
6e9ad1d
Merge branch 'master' of https://github.com/bitwarden/clients into AC…
djsmith85 Jun 23, 2023
8d63236
Fixed imports after messing up a merge conflict
djsmith85 Jun 23, 2023
126f662
Set No-Folder as default
djsmith85 Jun 26, 2023
1527354
Show icons (folder/collection) on targetSelector
djsmith85 Jun 26, 2023
95bc3c7
Add icons to vaultSelector
djsmith85 Jun 26, 2023
1dd29f4
Set `My Vault` as default of the vaultSelector
djsmith85 Jun 26, 2023
e2e0135
Updates labels based on feedback from design
djsmith85 Jun 26, 2023
d18da20
Merge branch 'master' of https://github.com/bitwarden/clients into AC…
djsmith85 Jun 26, 2023
015d551
Set `My Vault` as default of the vaultSelector pt2
djsmith85 Jun 26, 2023
c1a97d2
Merge branch 'master' of https://github.com/bitwarden/clients into AC…
djsmith85 Jun 26, 2023
f107f4e
Improvements to reactive forms on import.component
aj-rosado Jun 28, 2023
848f855
Only disabling individual vault import on PersonalOwnership policy
aj-rosado Jun 28, 2023
2c0fb86
Use import destination instead of import location
djsmith85 Jun 29, 2023
737c449
Merge branch 'master' of https://github.com/bitwarden/clients into AC…
djsmith85 Jun 29, 2023
d6b3317
Add hint to folder/collection dropdown
djsmith85 Jun 29, 2023
34ad52f
Removed required attribute as provided by formGroup
djsmith85 Jun 29, 2023
a0a885a
Display no collection option same as no folder
djsmith85 Jun 29, 2023
afcb9cf
Show error on org import with unassigned items
djsmith85 Jun 29, 2023
756e62d
Removed for-attribute from bit-labels
djsmith85 Jul 3, 2023
0494b26
Removed bitInput from bit-selects
djsmith85 Jul 3, 2023
b1e79db
Updates to messages.json after PR feedback
djsmith85 Jul 4, 2023
eb7b0cf
Removed name-attribute from bit-selects
djsmith85 Jul 4, 2023
dfb1817
Removed unneeded variables
djsmith85 Jul 4, 2023
7e66d8e
Removed unneeded line break
djsmith85 Jul 5, 2023
1e21da2
Migrate form to use bitSubmit
djsmith85 Jul 5, 2023
d415611
Added await to super.performImport()
djsmith85 Jul 5, 2023
a38f264
Move form check into submit
djsmith85 Jul 5, 2023
109589e
Merge branch 'master' of https://github.com/bitwarden/clients into AC…
djsmith85 Jul 6, 2023
c181c63
Merge branch 'master' of https://github.com/bitwarden/clients into AC…
djsmith85 Jul 25, 2023
2162674
Merge branch 'master' of https://github.com/bitwarden/clients into AC…
djsmith85 Jul 31, 2023
641a05d
AC-1558 - Enable org import with remove individual vault policy
djsmith85 Aug 1, 2023
80bcb4e
[AC-1549] Import page design updates (#5933)
djsmith85 Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use bitTypography as page header/title
  • Loading branch information
@djsmith85
djsmith85 committed Jun 20, 2023
commit 15689101afbbf6c94415526b03f28ebca6e639e1
4 changes: 1 addition & 3 deletions apps/web/src/app/tools/import-export/import.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<div class="page-header">
<h1>{{ "importData" | i18n }}</h1>
</div>
<h1 bitTypography="h1">{{ "importData" | i18n }}</h1>
<bit-callout type="info" *ngIf="importBlockedByPolicy">
{{ "personalOwnershipPolicyInEffectImports" | i18n }}
</bit-callout>
Expand Down