hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-12 20:43:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,188 Commits 23 Branches 25 Tags
173f14c41f323b61d5bed847d22043e8510b3405
Commit Graph

3188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Art Lowel
da4115f122 fix issues following rebase 2019-05-28 16:21:02 +02:00
Kristof De Langhe
41e14e176c Merge branch 'master' into w2p-62589_Item-mapper-update 
Conflicts:
	resources/i18n/en.json
	src/app/+collection-page/collection-page-routing.module.ts
	src/app/+collection-page/collection-page.module.ts
	src/app/+community-page/community-page.component.ts
	src/app/+item-page/edit-item-page/edit-item-page.component.ts
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
	src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts
	src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts
	src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts
	src/app/+item-page/edit-item-page/item-private/item-private.component.ts
	src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts
	src/app/+item-page/edit-item-page/item-public/item-public.component.ts
	src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
	src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
	src/app/+item-page/edit-item-page/item-status/item-status.component.ts
	src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
	src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
	src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
	src/app/+item-page/item-page-routing.module.ts
	src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
	src/app/+search-page/search-filters/search-filter/search-filter.component.ts
	src/app/+search-page/search-service/search.service.ts
	src/app/app.reducer.ts
	src/app/core/auth/auth-response-parsing.service.ts
	src/app/core/auth/auth.service.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/cache/builders/remote-data-build.service.ts
	src/app/core/cache/object-cache.service.ts
	src/app/core/core.module.ts
	src/app/core/data/collection-data.service.ts
	src/app/core/data/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/core/data/request.reducer.ts
	src/app/core/data/request.service.spec.ts
	src/app/core/data/request.service.ts
	src/app/core/index/index.effects.ts
	src/app/core/index/index.reducer.ts
	src/app/core/metadata/metadata.service.spec.ts
	src/app/core/shared/operators.spec.ts
	src/app/core/shared/operators.ts
	src/app/header/header.component.spec.ts
	src/app/shared/shared.module.ts
 2019-05-28 16:15:47 +02:00
Yana De Pauw
93075fc70f Merge branch 'w2p-55990_Move-item-component' into Move-item-component 2019-05-28 16:10:23 +02:00
Yana De Pauw
74bf69f984 62571: Move item update and test fixes 2019-05-28 15:47:42 +02:00
lotte
898795fba1 Solved issue where edit metadata page broke 2019-05-28 14:58:35 +02:00
lotte
81ba49f220 Simplified and refactored manual creation of remote data objects for tests 2019-05-28 14:58:10 +02:00
Art Lowel
11d06e34b1 moved themes to separate folder 2019-05-28 14:20:21 +02:00
lotte
cfcf496cc1 fixed tests 2019-05-28 14:18:56 +02:00
lotte
8a32777802 finished webpack config for switching themes 2019-05-28 14:18:56 +02:00
lotte
22928c3f23 intermediate theming commit 2019-05-28 13:53:12 +02:00
lotte
4a37759dea 61872: switching themes using wpack string replacer 2019-05-28 13:52:45 +02:00
lotte
3a7929369a working on extracting CSS in a separate file 2019-05-28 13:52:15 +02:00
lotte
139edd2df1 renamed theme to Mantis 2019-05-28 13:51:56 +02:00
lotte
1d99d8a535 61299: solved merge conflicts 2019-05-28 13:50:53 +02:00
lotte
a8aea654a1 cleaned up theming code 2019-05-28 13:50:29 +02:00
lotte
c0f3d38695 added banner and changed fonts 2019-05-28 13:47:43 +02:00
lotte
2cc3dd0694 added custom theming 2019-05-28 13:46:51 +02:00
lotte
856211d964 finished SCSS theming support 2019-05-28 13:44:00 +02:00
lotte
a4a4be9983 added different themes, issue with ngrx 2019-05-28 13:42:20 +02:00
Yana De Pauw
d55e234167 Merge remote-tracking branch 'upstream/master' into w2p-55990_Move-item-component 2019-05-28 13:15:43 +02:00
Yana De Pauw
395a78c360 62571: Update item move method 2019-05-28 13:14:59 +02:00
Yana De Pauw
41e9770a61 Merge branch 'master' into w2p-55990_Move-item-component 2019-05-28 11:50:32 +02:00
lotte
35f73708ef fixed issues after merging 2019-05-27 15:09:51 +02:00
lotte
a0a0830e5f 61949: merged master, resolving conflicts 2019-05-24 16:57:38 +02:00
lotte
233909d6ca Merge branch 'master' into w2p-61949_object-factory-refactoring 
Conflicts:
	src/app/core/cache/models/normalized-object-factory.ts
	src/app/core/cache/response.models.ts
	src/app/core/core.module.ts
	src/app/core/data/base-response-parsing.service.ts
	src/app/core/shared/resource-type.ts
	src/app/core/submission/submission-response-parsing.service.ts
 2019-05-24 15:42:24 +02:00
Kristof De Langhe
fca9b4d481 Merge branch 'master' into w2p-62063_Configurable-Browse-By 2019-05-24 14:13:24 +02:00
Kristof De Langhe
1fb6b45560 62063: 62063: Small Issue fixes 2019-05-24 14:12:43 +02:00
lotte
24fdbaf0bd 62530: fixed loading issue 2019-05-23 16:15:40 +02:00
lotte
c3bd151cc3 Fixed issue with retrieving request 2019-05-22 16:55:49 +02:00
lotte
8a5bffa881 62530: working on fixing preboot issue with fixed filters/route params 2019-05-21 17:02:36 +02:00
Kristof De Langhe
796afb3919 Merge branch 'master' into w2p-61142_Relations-add-edit-delete-and-permissions 
Conflicts:
	src/app/core/cache/object-cache.service.ts
	src/app/core/core.module.ts
	src/app/core/data/request.service.ts
	src/app/core/shared/item.model.ts
 2019-05-20 13:08:33 +02:00
Kristof De Langhe
b8822e996d 62264: Fix module export 2019-05-20 10:50:49 +02:00
Kristof De Langhe
e9bfb77300 Merge branch 'master' into w2p-62264_Group-logical-entity-types-together 2019-05-20 10:09:20 +02:00
Tim Donohue
2d07cc1913 Reset URL to use DSpace 7 REST API Demo site. 2019-05-17 13:37:57 -05:00
Tim Donohue
6ba7fb34fa Reset URL to use DSpace 7 REST API Demo site. dspace-7.0-preview-1 2019-05-17 13:36:46 -05:00
Tim Donohue
24907a7405 Merge pull request #399 from atmire/preview-misc-fixes-2-themed 
[Preview theme] Miscellaneous fixes for Preview Release - Part 2
 2019-05-17 12:32:11 -05:00
Art Lowel
cb28c4fc0c fix getIDHref mock, it returns a string, not an observable 2019-05-17 17:49:48 +02:00
Tim Donohue
31c9694666 Merge pull request #398 from atmire/preview-misc-fixes-2 
Miscellaneous fixes for Preview Release - Part 2
 2019-05-17 10:07:50 -05:00
lotte
9ac0aaeb28 removed lint issues 2019-05-17 17:00:22 +02:00
lotte
8d379870ca fixed submission collection list 2019-05-17 16:58:26 +02:00
Art Lowel
69331ae2db Merge branch 'preview-misc-fixes-2' into preview-misc-fixes-2-themed 2019-05-17 14:36:50 +02:00
Art Lowel
081c5d0952 fix lint error 2019-05-17 14:36:22 +02:00
Art Lowel
1306f1a6a1 Merge branch 'preview-misc-fixes-2' of https://git.atmire.com/contributions/dspace-angular into preview-misc-fixes-2 2019-05-17 13:28:18 +02:00
Art Lowel
151ac0114f replace npm variable with dedicated script to run webpack with a larger heapspace. The variables didn't work cross-platform 2019-05-17 13:28:10 +02:00
lotte
8aaff69d97 fixed issue with thumbnails not showing 2019-05-17 11:43:54 +02:00
Art Lowel
d16335ddb1 update requirement versions in docs 2019-05-17 10:21:37 +02:00
lotte
9b03c02f29 disabled statistics link 2019-05-17 09:44:12 +02:00
Art Lowel
3da7786474 Merge branch 'preview-misc-fixes-2' into preview-misc-fixes-2-themed 2019-05-16 17:27:30 +02:00
lotte
0bdb0ba2b7 fixed test and search facet issue for mydspace 2019-05-16 17:11:13 +02:00
lotte
cbde7fc679 facet fix 2019-05-16 16:44:38 +02:00