Commit 0046160
committed
chore: resolve merge conflicts with origin/main
- tsconfig.json: use main's ES2022 target with decorators support
- jest.config.js: merge both test roots (src/__tests__ and tests/)
- package.json: union of both dependency sets
- src/index.ts: keep auth/admin routes + add redis health/metrics endpoints from main
- package-lock.json: regenerated after dependency merge174 files changed
Lines changed: 26070 additions & 4026 deletions
File tree
- .github/workflows
- .kiro/specs
- delegate-authorization
- deployment-registry
- policy-metadata-uri
- soroban-rpc-service
- backend
- prisma
- src
- __tests__
- admin
- auth
- decorators
- dto
- guards
- strategies
- cache
- claims
- dto
- common
- filters
- middleware
- config
- controllers
- db
- dto
- health
- helpers
- indexer
- ipfs
- interfaces
- providers
- services
- middleware
- notifications
- dto
- openapi
- policy
- dto
- prisma
- queues
- quote
- dto
- redis
- repositories
- routes
- rpc
- services
- soroban
- types
- webhooks
- providers
- tests
- test/ipfs
- contracts/niffyinsure
- src
- test_snapshots
- tests
- frontend/src/config
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
57 | 75 | | |
58 | 76 | | |
59 | 77 | | |
60 | 78 | | |
61 | 79 | | |
62 | 80 | | |
63 | | - | |
64 | | - | |
65 | 81 | | |
66 | | - | |
| 82 | + | |
67 | 83 | | |
68 | 84 | | |
69 | 85 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
1 | 12 | | |
2 | 13 | | |
| 14 | + | |
3 | 15 | | |
4 | | - | |
5 | | - | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
6 | 22 | | |
7 | | - | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
This file was deleted.
0 commit comments