hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-17 15:03:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,195 Commits 23 Branches 25 Tags
b2ef5ee2fa8b81c05e1d1adb5874c371209b61e3
Commit Graph

23 Commits

Author SHA1 Message Date
Kristof De Langhe
b2ef5ee2fa Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates 
Conflicts:
	package.json
	resources/i18n/en.json5
	src/app/+item-page/item-page.module.ts
	src/app/core/core.module.ts
	src/app/core/data/bundle-data.service.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/object-updates/object-updates.service.ts
	src/app/core/shared/hal-endpoint.service.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
	src/app/shared/mocks/mock-request.service.ts
	src/app/shared/shared.module.ts
	src/app/shared/trackable/abstract-trackable.component.ts
	yarn.lock
 2020-01-24 14:21:20 +01:00
Kristof De Langhe
792455f007 65240: Uploader alignment fix 2019-11-12 14:21:33 +01:00
Kristof De Langhe
bfb2ef021a 65240: AoT build error fixes 2019-10-07 14:05:54 +02:00
Kristof De Langhe
eade3e7d37 65240: Set uploader method to PUT if object already contains a logo 2019-10-01 16:53:21 +02:00
Kristof De Langhe
a2695edbac 65240: Add community/collection logo on create/edit pages 2019-10-01 14:42:25 +02:00
Kristof De Langhe
e76579ee00 Merge branch 'master' into w2p-64961_Edit-bitstream-page 
Conflicts:
	resources/i18n/en.json5
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/core/data/item-data.service.ts
	src/app/shared/shared.module.ts
 2019-09-17 15:38:02 +02:00
Art Lowel
154fc83930 fix typo 2019-09-12 17:14:19 +02:00
Kristof De Langhe
7bd6c9acab 64387: Upload bitstream component + Edit bitstream placeholder 2019-08-16 13:35:04 +02:00
lotte
8a32777802 finished webpack config for switching themes 2019-05-28 14:18:56 +02:00
Giuseppe Digilio
2a124887c0 added default value for onBeforeUpload property 2019-05-02 11:25:32 +02:00
Giuseppe Digilio
9a55771d51 align new submission button with upload drop zone 2019-04-25 14:48:59 +02: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
0c4784346b progress vertical menu 2018-11-14 15:56:23 +01:00
Giuseppe
a33513ef4b Handled error on upload file 2018-10-10 11:43:52 +02:00
Giuseppe
c6ce420873 Added scss variables 2018-08-31 19:05:07 +02:00
lotte
777facf5cd intermediate commit 2018-08-29 15:12:01 +02:00
lotte
2cbe6a6d91 upgrade to angular6 2018-08-24 13:26:43 +02:00
Giuseppe
6f60cd68e2 Merged submission module code 2018-07-26 18:36:36 +02:00
Giuseppe Digilio
683c2f2f6b Added testing utils functions 2018-07-11 18:42:45 +02:00
Giuseppe Digilio
ff41b80a33 Renamed form.reducers.ts to form.reducer.ts 
Created custom sass variable
Removed use of instanceof operator
 2018-07-03 17:51:26 +02:00
Giuseppe Digilio
876dba2892 Added tests 2018-05-10 17:24:09 +02:00
Giuseppe Digilio
7a32d18b1b Merged dynamic form module 2018-05-09 12:14:18 +02:00