Giuseppe Digilio 5aca8cc87d Merge remote-tracking branch 'remotes/origin/master' into upgrade-angular-7 ...

# Conflicts:
#	src/app/+collection-page/collection-form/collection-form.component.ts
#	src/app/+community-page/community-form/community-form.component.ts
#	src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts

2020-01-08 17:18:43 +01:00

..

collection-form

Merge remote-tracking branch 'remotes/origin/master' into upgrade-angular-7

2020-01-08 17:18:43 +01:00

collection-item-mapper

fixed issues after merge

2019-10-17 13:57:10 +02:00

create-collection-page

65240: Marking logo for deletion and request on form submit

2019-11-18 16:28:51 +01:00

delete-collection-page

got rid of TNormalized everywhere

2019-01-29 16:03:50 +01:00

edit-collection-page

65240: Marking logo for deletion and request on form submit

2019-11-18 16:28:51 +01:00

collection-page-routing.module.ts

Merge branch 'master' into w2p-65240_Community-and-collection-logos

2019-11-12 14:39:10 +01:00

collection-page.component.html

65240: Community and Collection logo layout

2019-12-12 13:11:54 +01:00

collection-page.component.scss

finished webpack config for switching themes

2019-05-28 14:18:56 +02:00

collection-page.component.ts

Tidying

2019-09-04 16:13:39 -04:00

collection-page.module.ts

Merge branch 'master' into w2p-65240_Community-and-collection-logos

2020-01-07 16:11:24 +01:00

collection-page.resolver.spec.ts

solved lint errors

2019-04-01 14:58:10 +02:00

collection-page.resolver.ts

added test and docs for 404 operator

2019-05-14 08:49:39 +02:00