Commit Graph

38 Commits

Author SHA1 Message Date
Kristof De Langhe
b51218ad5f Merge branch 'master' into w2p-67478_Search-external-sources-in-submission
Conflicts:
	src/app/+collection-page/collection-page.module.ts
	src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.html
	src/app/+item-page/simple/related-items/related-items-component.ts
	src/app/+search-page/configuration-search-page.component.spec.ts
	src/app/+search-page/configuration-search-page.component.ts
	src/app/+search-page/filtered-search-page.component.spec.ts
	src/app/+search-page/filtered-search-page.component.ts
	src/app/+search-page/search-page.component.html
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/+search-page/search.component.spec.ts
	src/app/app.reducer.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/core/data/relationship.service.ts
	src/app/core/shared/search/search-configuration.service.ts
	src/app/core/shared/search/search.service.ts
2019-12-06 11:56:28 +01:00
Antoine Snyers
dfa846a98e Track page views and searches in DSpace with a custom Angulartics2 provider 2019-11-28 09:54:39 +01:00
lotte
f79e210959 Merge branch 'w2p-65195_dynamic-component-refactoring' into clean-relationships-in-submission 2019-10-17 12:49:22 +02:00
lotte
e518380025 fixed import issues 2019-09-06 16:07:37 +02:00
lotte
2b24caba34 Merge branch 'master' into w2p-62355_optimize-search-performance 2019-09-06 15:22:44 +02:00
Kristof De Langhe
7269be9142 63825: use CookieService instead of ClientCookieService 2019-07-25 11:19:59 +02:00
Kristof De Langhe
c2345c1562 63825: UI language cookie 2019-07-18 13:01:17 +02:00
lotte
42c690dfd4 moved search module contents to shared 2019-07-10 13:17:28 +02:00
lotte
bb76015aa1 Solved issue with non-existing search pages 2019-06-18 08:58:35 +02:00
Giuseppe Digilio
3fab2c6234 Fix AOT build 2018-12-21 11:40:03 +01:00
Giuseppe Digilio
eda0ebb21c Merge remote-tracking branch 'origin/master' into submission
# Conflicts:
#	resources/i18n/en.json
#	src/app/app.component.scss
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/app.module.ts
#	src/app/shared/chips/chips.component.spec.ts
#	src/app/shared/chips/models/chips-item.model.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.html
#	src/app/shared/shared.module.ts
#	yarn.lock
2018-12-20 17:02:46 +01:00
Giuseppe Digilio
ff97a4cc8b Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
#	package.json
#	src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/app.module.ts
#	src/app/core/auth/auth.interceptor.ts
#	src/app/core/cache/response-cache.service.spec.ts
#	src/app/core/data/browse-response-parsing.service.spec.ts
#	src/app/core/data/data.service.spec.ts
#	src/app/core/data/request.service.spec.ts
#	src/app/core/data/request.service.ts
#	src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
#	src/app/core/integration/integration.service.ts
#	src/app/core/metadata/metadata.service.spec.ts
#	src/app/core/registry/registry.service.spec.ts
#	src/app/core/shared/collection.model.ts
#	src/app/core/shared/item.model.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.ts
#	src/app/shared/form/builder/form-builder.service.spec.ts
#	src/app/shared/form/form.service.spec.ts
#	src/app/shared/notifications/notification/notification.component.spec.ts
#	src/app/shared/services/route.service.spec.ts
#	src/app/shared/services/route.service.ts
#	src/app/shared/shared.module.ts
#	yarn.lock
2018-12-13 20:28:11 +01:00
lotte
6498d7dfbf added all tests 2018-12-13 14:18:14 +01:00
Giuseppe
b27e3d9e2f Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/core/auth/auth-response-parsing.service.ts
#	src/app/core/cache/models/normalized-object-factory.ts
#	src/app/core/cache/models/normalized-resource-policy.model.ts
#	src/app/core/core.module.ts
#	src/app/core/data/base-response-parsing.service.ts
#	src/app/core/data/config-response-parsing.service.spec.ts
#	src/app/core/data/config-response-parsing.service.ts
#	src/app/core/data/dso-response-parsing.service.ts
#	src/app/core/data/request.models.ts
#	src/app/core/data/search-response-parsing.service.ts
#	src/app/core/integration/integration-response-parsing.service.spec.ts
#	src/app/core/integration/integration-response-parsing.service.ts
#	src/app/core/shared/item.model.ts
#	src/app/core/shared/resource-policy.model.ts
#	src/app/core/shared/resource-type.ts
#	src/app/shared/shared.module.ts
#	src/app/thumbnail/thumbnail.component.html
2018-10-15 19:21:01 +02:00
lotte
f11d486d14 updated angular/rxjs to v6 successfully 2018-08-31 15:40:39 +02:00
lotte
1ea0e0ecfc fix for tests 2018-08-22 10:08:01 +02:00
Giuseppe
ba1337ec8f Improved redirect after 'Save for later' in Submission edit page 2018-07-31 17:51:10 +02:00
Giuseppe Digilio
e5bd262a2c Fixed tests 2018-05-08 12:11:15 +02:00
Kristof De Langhe
062f0f1a0e 50479: compile errors fixed 2018-03-23 10:12:20 +01:00
Kristof De Langhe
9454b9393b 50479: angularticsMock + tslint fixes 2018-03-20 15:54:11 +01:00
Art Lowel
4fbceab1b9 Switched to angular 5's built-in transfer state api 2018-02-01 13:17:59 +01:00
William Welling
f4c0df176e metadata service 2017-10-12 19:08:03 -05:00
William Welling
5b0dbfbc37 removed unused modules 2017-09-29 20:44:11 -05:00
Art Lowel
30ee3859c8 fixed issues with ngrx platform upgrade: selectors, tests and router state in the dev tools 2017-09-06 16:55:36 +02:00
William Welling
066bba28af fixed lint errors 2017-07-13 11:19:02 -05:00
William Welling
c08f5c672b dependency upgrades, server and platform module updates, linting wip 2017-07-12 14:33:16 -05:00
Giuseppe Digilio
c5c0bb776b Add host-window.service 2017-05-25 17:27:31 +02:00
Art Lowel
4eaa5e8471 Merge pull request #94 from artlowel/upgrade-to-ngx-translate
upgraded to ngx-translate
2017-05-18 17:43:03 +02:00
Art Lowel
cdb5f01198 upgraded to ngx-translate 2017-05-18 16:49:33 +02:00
Art Lowel
f5e5b72f47 added initial home page content 2017-05-18 15:02:33 +02:00
William Welling
2974d8aab1 Build setting some configs. Configs used by server. 2017-03-24 20:56:14 -05:00
William Welling
9b23393121 Working on config providor. 2017-03-24 16:57:11 -05:00
William Welling
415a52f011 Bring config into server. 2017-03-24 16:48:43 -05:00
Art Lowel
8fd1c6de5c added a MockTranslateLoader to fix 404 with ng2-translate during testing 2017-01-18 12:53:09 +01:00
Art Lowel
58b4b381e7 added test for window resize to app.component.spec.ts 2017-01-18 11:27:39 +01:00
Giuseppe Digilio
3766a4ba85 test issue 2017-01-13 18:39:24 +01:00
Giuseppe Digilio
28fd92b9f7 test issue 2017-01-13 18:37:35 +01:00
Giuseppe Digilio
144324e023 Dir tests deleted
test:watch added
webpack library updated
protractor installed locally
2017-01-10 09:45:29 +01:00