Merge remote-tracking branch 'origin/master' into w2p-44024_simple-search-with-select
Conflicts: package.json src/app/core/cache/builders/remote-data-build.service.ts src/app/shared/shared.module.ts
Showing
- .travis.yml 0 additions, 2 deletions.travis.yml
- package.json 5 additions, 6 deletionspackage.json
- src/app/app.component.spec.ts 1 addition, 1 deletionsrc/app/app.component.spec.ts
- src/app/app.effects.ts 3 additions, 6 deletionssrc/app/app.effects.ts
- src/app/app.metareducers.ts 38 additions, 0 deletionssrc/app/app.metareducers.ts
- src/app/app.module.ts 8 additions, 8 deletionssrc/app/app.module.ts
- src/app/app.reducer.ts 5 additions, 33 deletionssrc/app/app.reducer.ts
- src/app/browser-app.module.ts 8 additions, 1 deletionsrc/app/browser-app.module.ts
- src/app/core/cache/builders/remote-data-build.service.ts 10 additions, 10 deletionssrc/app/core/cache/builders/remote-data-build.service.ts
- src/app/core/cache/cache.reducers.ts 0 additions, 18 deletionssrc/app/core/cache/cache.reducers.ts
- src/app/core/cache/object-cache.reducer.ts 2 additions, 2 deletionssrc/app/core/cache/object-cache.reducer.ts
- src/app/core/cache/object-cache.service.spec.ts 4 additions, 3 deletionssrc/app/core/cache/object-cache.service.spec.ts
- src/app/core/cache/object-cache.service.ts 18 additions, 8 deletionssrc/app/core/cache/object-cache.service.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 14 additions, 7 deletionssrc/app/core/cache/response-cache.service.ts
- src/app/core/core.effects.ts 4 additions, 4 deletionssrc/app/core/core.effects.ts
- src/app/core/core.module.ts 7 additions, 1 deletionsrc/app/core/core.module.ts
- src/app/core/core.reducers.ts 15 additions, 14 deletionssrc/app/core/core.reducers.ts
- src/app/core/data/data.reducers.ts 0 additions, 15 deletionssrc/app/core/data/data.reducers.ts
- src/app/core/data/request-cache.effects.ts 3 additions, 11 deletionssrc/app/core/data/request-cache.effects.ts
Please register or sign in to comment