Commit Graph

19 Commits

Author SHA1 Message Date
Kristof De Langhe
78a5bd5fce 71429: Unauthorized component 2020-06-24 14:22:28 +02:00
lotte
6b6068ffb8 Merge branch 'master' into angular-cli 2020-03-31 13:49:40 +02:00
Giuseppe Digilio
7cf0480098 Merge remote-tracking branch 'remotes/origin/master' into shibboleth
# Conflicts:
#	src/app/app-routing.module.ts
#	src/app/core/auth/auth.service.ts
#	src/app/shared/shared.module.ts
2020-03-23 10:36:19 +01:00
lotte
8bf241c182 angular cli 2020-03-18 16:03:40 +01:00
lotte
d5484e5c89 created admin search page 2020-03-06 13:54:46 +01:00
Giuseppe Digilio
076ee8b26d Merge remote-tracking branch 'remotes/origin/master' into shibboleth
# Conflicts:
#	src/app/core/auth/auth.service.ts
#	src/app/core/auth/models/auth-status.model.ts
#	src/app/core/auth/models/normalized-auth-status.model.ts
#	src/app/core/auth/server-auth.service.ts
#	src/app/core/core.module.ts
#	src/app/shared/shared.module.ts
2020-02-25 17:31:07 +01:00
lotte
04cb75e786 upgraded to angular 8 2020-02-13 11:09:20 +01:00
Giuseppe Digilio
cc4b7b215e Prevent that RouteService is instantiated two times on both SSR and CSR 2020-02-07 13:08:19 +01:00
Giuseppe Digilio
ddb787277b Fix failed test 2020-01-17 13:08:26 +01:00
Kristof De Langhe
4ba3b01997 Merge branch 'master' into w2p-67478_Search-external-sources-in-submission
Conflicts:
	src/app/core/data/data.service.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
2020-01-14 12:46:55 +01:00
Giuseppe Digilio
ff80afb839 Moved history state from AppState to CoreState 2020-01-13 10:25:16 +01:00
Giuseppe Digilio
ee8293978f Merge remote-tracking branch 'remotes/origin/master' into upgrade-angular-7
# Conflicts:
#	src/app/core/services/route.service.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
#	src/app/shared/form/builder/form-builder.service.ts
#	src/app/shared/object-list/object-list.component.spec.ts
#	src/app/submission/submission.service.ts
2019-12-24 15:57:06 +01:00
Kristof De Langhe
904228127e Merge remote-tracking branch 'atmire/clean-relationships-in-submission' into w2p-67478_Search-external-sources-in-submission
Conflicts:
	src/app/+item-page/simple/related-items/related-items-component.ts
	src/app/+search-page/configuration-search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/+search-page/search-tracker.component.ts
	src/app/+search-page/search.component.ts
	src/app/app.reducer.ts
	src/app/core/data/data.service.ts
	src/app/core/data/relationship.service.ts
	src/app/core/services/route.service.ts
	src/app/core/utilities/equatable.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
	src/app/shared/form/builder/models/relationship-options.model.ts
2019-12-19 11:55:28 +01:00
Kristof De Langhe
64eb5db05b 67478: JSDocs intermediate commit 2019-12-19 11:36:39 +01:00
lotte
0dbea31b0d added typedoc 2019-12-19 09:23:13 +01:00
Giuseppe Digilio
ea4e9f8797 Fixed errors after upgrade to angular 7 2019-12-17 13:10:53 +01:00
Art Lowel
77f6294bde fix linting issues 2019-11-26 17:42:27 +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
bb76015aa1 Solved issue with non-existing search pages 2019-06-18 08:58:35 +02:00