Skip to content
Snippets Groups Projects
  1. Mar 15, 2019
    • Kristof De Langhe's avatar
      61133: Post-merge test fixes · ef161681
      Kristof De Langhe authored
      ef161681
    • Kristof De Langhe's avatar
      5d091e69
    • Kristof De Langhe's avatar
    • Kristof De Langhe's avatar
      61133: Post-merge test fixes · e6d401d1
      Kristof De Langhe authored
      e6d401d1
    • Kristof De Langhe's avatar
      61133: Post-merge refactoring · a9397f0b
      Kristof De Langhe authored
      a9397f0b
    • Kristof De Langhe's avatar
      Merge remote-tracking branch 'atmire/mixing-text-authority-entities' into... · 6c3fb556
      Kristof De Langhe authored
      Merge remote-tracking branch 'atmire/mixing-text-authority-entities' into w2p-61133_Merge-345-and-master
      
      Conflicts:
      	src/app/+collection-page/collection-page.component.ts
      	src/app/+collection-page/collection-page.module.ts
      	src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
      	src/app/+item-page/field-components/metadata-values/metadata-values.component.ts
      	src/app/+item-page/simple/field-components/specific-field/item-page-field.component.html
      	src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html
      	src/app/+search-page/search-service/search.service.ts
      	src/app/core/core.module.ts
      	src/app/core/data/base-response-parsing.service.ts
      	src/app/core/data/data.service.ts
      	src/app/core/data/request.service.spec.ts
      	src/app/core/metadata/metadata.service.spec.ts
      	src/app/core/shared/dspace-object.model.ts
      	src/app/core/shared/metadatum.model.ts
      	src/app/core/shared/operators.ts
      	src/app/core/shared/resource-type.ts
      	src/app/shared/object-list/item-list-element/item-list-element.component.html
      	src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts
      	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
      	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
      	src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
      	src/app/shared/services/route.service.ts
      	src/app/shared/shared.module.ts
      6c3fb556
  2. Mar 01, 2019
  3. Feb 27, 2019
  4. Feb 26, 2019
  5. Feb 25, 2019
    • lotte's avatar
      Merge branch 'master' into w2p-59334_edit-item-metadata-branch · c40179fc
      lotte authored
      Conflicts:
      	src/app/+community-page/community-page.component.ts
      	src/app/core/auth/server-auth.service.ts
      	src/app/core/data/dso-response-parsing.service.ts
      	src/app/core/data/item-data.service.ts
      	src/app/core/data/metadata-schema-data.service.ts
      	src/app/core/data/request.models.ts
      	src/app/core/metadata/metadata.service.spec.ts
      	src/app/core/metadata/normalized-metadata-schema.model.ts
      	src/app/core/shared/metadatum.model.ts
      	src/app/core/shared/operators.spec.ts
      	src/app/shared/shared.module.ts
      c40179fc
    • lotte's avatar
      bug fixing · 35be122e
      lotte authored
      35be122e
  6. Feb 21, 2019
  7. Feb 20, 2019
  8. Feb 19, 2019
  9. Feb 14, 2019
  10. Feb 13, 2019
  11. Feb 12, 2019
  12. Feb 11, 2019
Loading