resolved merge conflicts
Showing
- src/app/core/cache/builders/remote-data-build.service.ts 44 additions, 28 deletionssrc/app/core/cache/builders/remote-data-build.service.ts
- src/app/core/cache/object-cache.reducer.spec.ts 23 additions, 23 deletionssrc/app/core/cache/object-cache.reducer.spec.ts
- src/app/core/cache/object-cache.reducer.ts 6 additions, 6 deletionssrc/app/core/cache/object-cache.reducer.ts
- src/app/core/cache/object-cache.service.spec.ts 28 additions, 29 deletionssrc/app/core/cache/object-cache.service.spec.ts
- src/app/core/cache/object-cache.service.ts 33 additions, 33 deletionssrc/app/core/cache/object-cache.service.ts
- src/app/core/cache/response-cache.actions.ts 3 additions, 3 deletionssrc/app/core/cache/response-cache.actions.ts
- src/app/core/cache/response-cache.models.ts 17 additions, 4 deletionssrc/app/core/cache/response-cache.models.ts
- src/app/core/cache/response-cache.reducer.ts 2 additions, 2 deletionssrc/app/core/cache/response-cache.reducer.ts
- src/app/core/cache/response-cache.service.ts 2 additions, 2 deletionssrc/app/core/cache/response-cache.service.ts
- src/app/core/core.effects.ts 2 additions, 2 deletionssrc/app/core/core.effects.ts
- src/app/core/core.module.ts 7 additions, 3 deletionssrc/app/core/core.module.ts
- src/app/core/core.reducers.ts 3 additions, 3 deletionssrc/app/core/core.reducers.ts
- src/app/core/data/collection-data.service.ts 1 addition, 3 deletionssrc/app/core/data/collection-data.service.ts
- src/app/core/data/community-data.service.ts 1 addition, 3 deletionssrc/app/core/data/community-data.service.ts
- src/app/core/data/data.service.ts 61 additions, 24 deletionssrc/app/core/data/data.service.ts
- src/app/core/data/dso-response-parsing.service.ts 149 additions, 0 deletionssrc/app/core/data/dso-response-parsing.service.ts
- src/app/core/data/item-data.service.ts 1 addition, 3 deletionssrc/app/core/data/item-data.service.ts
- src/app/core/data/parsing.service.ts 7 additions, 0 deletionssrc/app/core/data/parsing.service.ts
- src/app/core/data/remote-data.ts 1 addition, 1 deletionsrc/app/core/data/remote-data.ts
- src/app/core/data/request.actions.ts 3 additions, 4 deletionssrc/app/core/data/request.actions.ts
Please register or sign in to comment