Commit Graph

11 Commits

Author SHA1 Message Date
Federico Andrés Maccaroni c6919f3484 Merge remote-tracking branch 'clients/master' into PS-589-add-2fa-new-device-login-settings-flag
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2022-06-06 15:18:42 -03:00
Federico Andrés Maccaroni 65cef08f7b Merge commit '02fe7159034b04d763a61fcf0200869e3209fa33' into PS-589-add-2fa-new-device-login-settings-flag
# Conflicts:
#	apps/web/src/app/modules/vault-filter/organization-vault-filter.component.ts
#	jslib
2022-06-06 15:16:00 -03:00
Gbubemi Smith d542d42637
migrated PR to mono repo (#2837) 2022-06-06 18:08:06 +01:00
Oscar Hinton da5e4a57d0
Merge pull request #2824 from bitwarden/jslib 2022-06-03 19:40:59 +02:00
Oscar Hinton 5780bf85e7
Add support for migrated jslib (#2826) 2022-06-03 18:01:07 +02:00
Micaiah Martin c609e8bb8f
Migrate Web workflows from old repo (#2776) 2022-06-03 08:35:46 -06:00
Oscar Hinton 1e7a402b45
Move web issue template (#2815) 2022-06-02 22:48:58 +02:00
Oscar Hinton 4869a231bf
[EC-251] Fix web local development (#2775)
* Wip

* Fix bitwarden licensed web

* Fix template paths

* Cleanup gitattributes git-blame-ignore-revs

* Fix tsconfig, add postcss and tailwind config to bitwarden_license.

* And done
2022-06-02 10:59:43 -05:00
Hinton b04b8651e8 Fix linter for web 2022-06-02 13:44:03 +02:00
Hinton 2ea7613854 Add missing git submodule 2022-06-02 13:37:22 +02:00
Hinton 02fe715903 Move web to apps/web and bitwarden_license/bit-web 2022-06-02 11:55:37 +02:00