Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into sync-with-finos-main
Browse files Browse the repository at this point in the history
# Conflicts:
#	vuu-ui/packages/vuu-layout/src/layout-persistence/LocalLayoutPersistenceManager.ts
#	vuu-ui/packages/vuu-layout/src/layout-persistence/index.ts
#	vuu-ui/packages/vuu-layout/test/layout-persistence/LocalLayoutPersistenceManager.test.ts
#	vuu-ui/packages/vuu-shell/src/layout-management/useLayoutManager.tsx
#	vuu-ui/packages/vuu-shell/src/shell.tsx
#	vuu-ui/showcase/src/examples/Apps/NewTheme.examples.tsx
#	vuu-ui/showcase/src/examples/VuuFeatures/BasketTradingFeature.examples.tsx
#	vuu-ui/showcase/src/examples/VuuFeatures/FilterTableFeature.examples.tsx
#	vuu-ui/showcase/src/examples/VuuFeatures/InstrumentTilesFeature.examples.tsx
  • Loading branch information
pling-scottlogic committed Oct 23, 2023
2 parents 50afdc4 + ee5d06a commit 80d4678
Show file tree
Hide file tree
Showing 243 changed files with 3,564 additions and 2,574 deletions.
2 changes: 1 addition & 1 deletion vuu-ui/cypress/support/component/index.css

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions vuu-ui/cypress/support/component/index.css.map

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions vuu-ui/global.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
declare module "@thomaschaplin/isin-generator" {
export const isinGenerator = () => undefined;
}
Loading

0 comments on commit 80d4678

Please sign in to comment.