Merge branch 'master' into w2p-50632_Replace-mock-registry-service-with-implementation
Conflicts: src/app/core/core.module.ts
Showing
- config/environment.default.js 11 additions, 0 deletionsconfig/environment.default.js
- docs/Configuration.md 55 additions, 0 deletionsdocs/Configuration.md
- src/app/+home-page/home-page.component.ts 0 additions, 1 deletionsrc/app/+home-page/home-page.component.ts
- src/app/+home-page/home-page.module.ts 1 addition, 1 deletionsrc/app/+home-page/home-page.module.ts
- src/app/app.component.html 17 additions, 11 deletionssrc/app/app.component.html
- src/app/app.component.ts 1 addition, 8 deletionssrc/app/app.component.ts
- src/app/app.effects.ts 3 additions, 1 deletionsrc/app/app.effects.ts
- src/app/app.module.ts 5 additions, 2 deletionssrc/app/app.module.ts
- src/app/app.reducer.ts 35 additions, 32 deletionssrc/app/app.reducer.ts
- src/app/core/core.module.ts 2 additions, 0 deletionssrc/app/core/core.module.ts
- src/app/shared/animations/fade.ts 12 additions, 2 deletionssrc/app/shared/animations/fade.ts
- src/app/shared/animations/fromBottom.ts 26 additions, 0 deletionssrc/app/shared/animations/fromBottom.ts
- src/app/shared/animations/fromLeft.ts 26 additions, 0 deletionssrc/app/shared/animations/fromLeft.ts
- src/app/shared/animations/fromRight.ts 26 additions, 0 deletionssrc/app/shared/animations/fromRight.ts
- src/app/shared/animations/fromTop.ts 26 additions, 0 deletionssrc/app/shared/animations/fromTop.ts
- src/app/shared/animations/rotate.ts 26 additions, 0 deletionssrc/app/shared/animations/rotate.ts
- src/app/shared/animations/scale.ts 26 additions, 0 deletionssrc/app/shared/animations/scale.ts
- src/app/shared/mocks/mock-admin-guard.service.ts 23 additions, 0 deletionssrc/app/shared/mocks/mock-admin-guard.service.ts
- src/app/shared/notifications/models/notification-animations-type.ts 16 additions, 0 deletions...ared/notifications/models/notification-animations-type.ts
- src/app/shared/notifications/models/notification-options.model.ts 22 additions, 0 deletions...shared/notifications/models/notification-options.model.ts
Please register or sign in to comment