Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates
Conflicts: package.json src/app/+item-page/item-page-routing.module.ts src/app/core/cache/builders/remote-data-build.service.ts src/app/core/cache/server-sync-buffer.effects.ts src/app/core/core.module.ts src/app/core/data/bitstream-data.service.ts src/app/core/data/bundle-data.service.ts src/app/core/data/data.service.ts src/app/core/data/dso-change-analyzer.service.ts src/app/core/data/item-data.service.ts src/app/core/data/object-updates/object-updates.actions.ts src/app/core/shared/bitstream.model.ts src/app/core/shared/dspace-object.model.ts src/app/shared/mocks/mock-request.service.ts src/app/shared/shared.module.ts yarn.lock
Showing
- .dockerignore 19 additions, 12 deletions.dockerignore
- .travis.yml 1 addition, 1 deletion.travis.yml
- Dockerfile 4 additions, 2 deletionsDockerfile
- README.md 2 additions, 2 deletionsREADME.md
- config/environment.default.js 1 addition, 1 deletionconfig/environment.default.js
- docker/docker-compose-rest.yml 1 addition, 1 deletiondocker/docker-compose-rest.yml
- docker/docker-compose-travis.yml 1 addition, 1 deletiondocker/docker-compose-travis.yml
- docker/local.cfg 1 addition, 2 deletionsdocker/local.cfg
- e2e/search-navbar/search-navbar.po.ts 1 addition, 6 deletionse2e/search-navbar/search-navbar.po.ts
- package.json 34 additions, 37 deletionspackage.json
- resources/i18n/en.json5 16 additions, 1 deletionresources/i18n/en.json5
- resources/i18n/nl.json5 1523 additions, 2155 deletionsresources/i18n/nl.json5
- spec-bundle.js 2 additions, 2 deletionsspec-bundle.js
- src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts 11 additions, 12 deletions...d-bitstream-format/add-bitstream-format.component.spec.ts
- src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts 11 additions, 11 deletions...ies/bitstream-formats/bitstream-formats.component.spec.ts
- src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts 1 addition, 1 deletion...gistries/bitstream-formats/bitstream-formats.component.ts
- src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts 12 additions, 13 deletions...-bitstream-format/edit-bitstream-format.component.spec.ts
- src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts 1 addition, 1 deletion...tstream-formats/format-form/format-form.component.spec.ts
- src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts 3 additions, 1 deletion...registries/metadata-registry/metadata-registry.actions.ts
- src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts 11 additions, 3 deletions...ies/metadata-registry/metadata-registry.component.spec.ts
Please register or sign in to comment