Commits · 5b261446e8a3a202b626717bd4f95baa0d892c45 · vtechworks / Dspace7 Angular

Oct 31, 2018
- Merge branch 'resolvers-branch-angular6' into patch-support · 5b261446
  lotte authored 6 years ago
```
Conflicts:
	src/app/app.module.ts
```
  5b261446
Oct 22, 2018
- fix AoT issues with store devtools · 335d74ea
  Art Lowel authored 6 years ago
  
  335d74ea
- configure @ngrx/store-devtools · 7ada6c7b
  Art Lowel authored 6 years ago
  
  7ada6c7b
Oct 12, 2018
- Merge remote-tracking branch 'atmire-internal/responseMsToLive' into patch-support · b1c6d68c
  lotte authored 6 years ago
```
Conflicts:
	src/app/core/data/request.models.ts
	src/config/cache-config.interface.ts
```
  b1c6d68c
- Merge branch 'resolvers-branch-angular6' into patch-support · 18a57b09
  lotte authored 6 years ago
  
  18a57b09
- improved test compiling time · 5b71788a
  lotte authored 6 years ago
  
  5b71788a
- Merge branch 'resolvers-branch-angular6' into patch-support · f198b1dd
  lotte authored 6 years ago
  
  f198b1dd
- Merge branch 'master' into resolvers-branch-angular6 · 998ed9af
  lotte authored 6 years ago
  
  998ed9af
- removed test form · 12398d86
  lotte authored 6 years ago
  
  12398d86
- finished tests and docs · 8ffbd132
  lotte authored 6 years ago
  
  8ffbd132
Oct 11, 2018

Merge pull request #303 from atmire/hide-metadata-labels-without-value · 8c124f22
Tim Donohue authored 6 years ago
```
Hide metadata labels without value
```
8c124f22

Merge branch 'resolvers-branch-angular6' into patch-support · 1928da8c

lotte authored 6 years ago

Conflicts:
	src/app/core/auth/auth-response-parsing.service.spec.ts
	src/app/core/auth/auth.service.ts
	src/app/core/auth/models/auth-status.model.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/core/data/dspace-object-data.service.ts
	src/app/core/data/item-data.service.spec.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/request.models.ts
	src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
	src/app/shared/mocks/mock-form-service.ts
	src/app/shared/mocks/mock-remote-data-build.service.ts
	src/app/shared/mocks/mock-store.ts

1928da8c

55143: fixed all tests · 3a8f7754
lotte authored 6 years ago

3a8f7754

Oct 09, 2018
- Remove the 'f' in fdescribe · 7ac26843
  Antoine Snyers authored 6 years ago
  
  7ac26843
- Hide metadata labels when there are no values · bbe22d96
  Antoine Snyers authored 6 years ago
  
  bbe22d96
- Add tests for the MetadataFieldWrapperComponent · 9c444764
  Antoine Snyers authored 6 years ago
  
  9c444764
Oct 08, 2018

rxjs migrate · 7c16ccaf
lotte authored 6 years ago

7c16ccaf

Merge branch 'master' into resolvers-branch-angular6 · e025f3bc

lotte authored 6 years ago

Conflicts:
	package.json
	src/app/+search-page/search-filters/search-filters.component.ts
	src/app/core/auth/auth.effects.ts
	src/app/core/auth/auth.service.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/data/comcol-data.service.ts
	src/app/core/data/community-data.service.ts
	src/app/core/data/data.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/header/header.component.spec.ts
	src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
	src/app/shared/testing/auth-service-stub.ts
	yarn.lock

e025f3bc

commit before merge · 199d8a8c
lotte authored 6 years ago

199d8a8c
Merge pull request #300 from cjuergen/german-translation · 1a20cec4
Art Lowel authored 6 years ago
```
Initial German Translation 
```
1a20cec4
Initial German Translation · c8ab655b
cjuergen authored 6 years ago

c8ab655b

Oct 05, 2018
- Merge pull request #296 from bram-atmire/issue-295-dutch-translation · da4593a2
  Art Lowel authored 6 years ago
```
Issue #295 Dutch translation
```
  da4593a2
- Merge pull request #297 from helix84/czech-l10n · c0e32457
  Art Lowel authored 6 years ago
```
Czech translation
```
  c0e32457
Oct 04, 2018
- minor fixes in en.json · a83c6c05
  helix84 authored 6 years ago
  
  a83c6c05
- Create cs.json · b2fef4d6
  helix84 authored 6 years ago
  
  b2fef4d6
- Dutch translation · 031c4c0c
  Bram Luyten authored 6 years ago
  
  031c4c0c
Sep 28, 2018
- add responseMsToLive to requests · b308df20
  Art Lowel authored 6 years ago
  
  b308df20
Sep 27, 2018

Merge pull request #290 from atmire/authorization-issue · 5912c887
Tim Donohue authored 6 years ago
```
Fix for authentication
```
5912c887
finalized put/patch requests · 1680f677
lotte authored 6 years ago

1680f677

Merge remote-tracking branch 'atmire-internal/w2p-55565_authorization-issue' into patch-support · dc574798

lotte authored 6 years ago

Conflicts:
	package.json
	src/app/+search-page/search-filters/search-filters.component.ts
	src/app/core/auth/auth.effects.ts
	src/app/core/auth/auth.service.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/data/data.service.ts
	src/app/header/header.component.spec.ts
	src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
	src/app/shared/testing/auth-service-stub.ts
	yarn.lock

dc574798

Added links to issues · bfc70f4f
lotte authored 6 years ago

bfc70f4f

Sep 26, 2018
- intermediate bug commit · 8c05ed86
  lotte authored 6 years ago
  
  8c05ed86
Sep 24, 2018
- Merge pull request #291 from tdonohue/bootstrap_update · bfb6b1f2
  Art Lowel authored 6 years ago
```
Update version of Bootstrap per CVE-2018-14041
```
  bfb6b1f2
Sep 21, 2018
- Update version of Bootstrap per CVE-2018-14041 · 90292313
  Tim Donohue authored 6 years ago
  
  90292313
Sep 20, 2018
- fixed tslint error · 7db30e88
  lotte authored 6 years ago
  
  7db30e88
- disabled reloads · a2bcdfbe
  lotte authored 6 years ago
  
  a2bcdfbe
Sep 19, 2018
- Small fix · bae69aef
  lotte authored 6 years ago
  
  bae69aef
- Finished patch support · c6f55e42
  lotte authored 6 years ago
  
  c6f55e42
- implemented applying of a patch · e959542e
  lotte authored 6 years ago
  
  e959542e
Sep 18, 2018
- fixed redirect after login · e96eeeaa
  lotte authored 6 years ago
  
  e96eeeaa

Admin message