hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-14 13:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,210 Commits 23 Branches 25 Tags
10bb457897d824bcd6e711abc4fb211b876ebecc
Commit Graph

3210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Donohue
95bd8c8653 Merge pull request #401 from atmire/Group-Entity-Types 
Group logical entity types together
 2019-05-31 11:42:13 -05:00
Tim Donohue
984da54e1a Merge pull request #407 from atmire/Fixed-filtered-search-page 
Fixed filtered search page
 2019-05-31 11:36:26 -05:00
Art Lowel
50effd3b70 fix exposed_variables issue with AoT build 2019-05-31 13:24:04 +02:00
lotte
16ebaf1bfe resolved PR feedback and solved possible bug 2019-05-31 13:10:47 +02:00
Art Lowel
d93173e8d2 add syncbuilddir step to aot build 2019-05-31 09:44:49 +02:00
dependabot[bot]
1f9e014df0 Bump webpack-bundle-analyzer from 2.13.1 to 3.3.2 
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 2.13.1 to 3.3.2.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v2.13.1...v3.3.2)
 2019-05-30 11:02:34 +00:00
Art Lowel
32e7b7a3b4 fix merge mistakes 2019-05-30 10:12:37 +02:00
Art Lowel
eca6aa9b04 refactor webpack config 2019-05-30 10:06:06 +02:00
Art Lowel
b352137fb3 add i18n labels for person facets 2019-05-29 18:05:30 +02:00
Kristof De Langhe
7d75454623 Merge branch 'travis-without-global-script' into w2p-62339_Relationships-link-to-item-via-HAL-links 2019-05-29 14:50:25 +02:00
lotte
813a856ed8 removed default value for search configuration 2019-05-29 13:48:50 +02:00
lotte
b846384ba7 Added typedoc and remove unnecessary import statements 2019-05-29 13:10:42 +02:00
Kristof De Langhe
acf83f6261 62589: Test provider fix 2019-05-29 12:03:27 +02:00
Kristof De Langhe
df730efbd0 62589: Provider and POST item-collection mapping fix 2019-05-29 11:44:34 +02:00
Kristof De Langhe
4143824bb8 Merge branch 'master' into w2p-62339_Relationships-link-to-item-via-HAL-links 
Conflicts:
	src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts
	src/app/+item-page/simple/item-types/shared/item.component.ts
 2019-05-29 10:27:19 +02:00
Kristof De Langhe
28fe62f918 62589: Fix mappedCollections endpoint 2019-05-29 10:01:47 +02:00
lotte
f763dcf752 Merge branch 'travis-without-global-script' into Fixed-filtered-search-page 2019-05-29 10:01:40 +02:00
lotte
b5c98e6917 Removed call to global script from travis setup 2019-05-29 10:00:08 +02:00
lotte
49dc4b86e2 Fixed issue with switch component on mydspace page 2019-05-29 09:24:33 +02:00
Philip Vissenaekens
a419e64cef 62571: removed duplicate line 2019-05-28 17:13:18 +02:00
Kristof De Langhe
045b87c1c8 62589: Post-Merge Tests and error fixes 2019-05-28 17:03:57 +02:00
Kristof De Langhe
2b1fd76365 62589: Fixed order of imports messing with routes 2019-05-28 16:42:02 +02:00
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