hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-14 21:43:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,131 Commits 23 Branches 25 Tags
2db0bf44f30233091bc5cfff2023751faaaec0f1
Commit Graph

54 Commits

Author SHA1 Message Date
Kristof De Langhe
2db0bf44f3 62741: PR Feedback changes 2019-08-12 10:22:49 +02:00
Kristof De Langhe
cee7ffeb04 Merge branch 'master' into w2p-62741_Entities-grid-templates 2019-07-17 13:13:08 +02:00
Kristof De Langhe
47994f9557 62741: Entities grid templates tests 2019-06-07 15:18:38 +02:00
Kristof De Langhe
0a32d3f915 62741: Remove whitespace and entity thumbnails from grid templates 2019-06-07 13:23:03 +02:00
Kristof De Langhe
22ae5a04e7 62741: Journal-types grid elements & grid thumbnail fix/improvement 2019-06-07 12:51:27 +02:00
Kristof De Langhe
16bad82564 62741: Entities grid templates - publication, orgunit, person, project 2019-06-06 18:00:54 +02:00
lotte
8a32777802 finished webpack config for switching themes 2019-05-28 14:18:56 +02:00
Kristof De Langhe
0390f67d01 Merge branch 'master' into w2p-62372_Final-master-merge 
Conflicts:
	config/environment.default.js
	resources/i18n/en.json
	src/app/+search-page/paginated-search-options.model.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
	src/app/+search-page/search-options.model.ts
	src/app/+search-page/search-page.component.spec.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/+search-page/search-service/search-configuration.service.ts
	src/app/core/cache/response.models.ts
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
	src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
	src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.ts
	src/app/shared/services/route.service.ts
 2019-05-13 12:47:21 +02:00
Giuseppe Digilio
7c48504c82 renamed dspaceObject to indexableObject 2019-04-03 15:27:08 +02:00
Kristof De Langhe
6c3fb556d8 Merge remote-tracking branch 'atmire/mixing-text-authority-entities' into w2p-61133_Merge-345-and-master 
Conflicts:
	src/app/+collection-page/collection-page.component.ts
	src/app/+collection-page/collection-page.module.ts
	src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
	src/app/+item-page/field-components/metadata-values/metadata-values.component.ts
	src/app/+item-page/simple/field-components/specific-field/item-page-field.component.html
	src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html
	src/app/+search-page/search-service/search.service.ts
	src/app/core/core.module.ts
	src/app/core/data/base-response-parsing.service.ts
	src/app/core/data/data.service.ts
	src/app/core/data/request.service.spec.ts
	src/app/core/metadata/metadata.service.spec.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/core/shared/metadatum.model.ts
	src/app/core/shared/operators.ts
	src/app/core/shared/resource-type.ts
	src/app/shared/object-list/item-list-element/item-list-element.component.html
	src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
	src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
	src/app/shared/services/route.service.ts
	src/app/shared/shared.module.ts
 2019-03-15 09:59:30 +01:00
lotte
8a9f57966f Fixed conflicts with new metadata map 2019-02-26 16:06:33 +01:00
Chris Wilper
4c8747a345 DS-4107 Improve TypeDocs 2019-02-14 14:46:27 -05:00
Chris Wilper
ea9ce6194c DS-4107 Update tests and mocks for metadata as map 2019-02-14 12:29:40 -05:00
Chris Wilper
2368df9513 DS-4107 Retrieve and model metadata as a map 2019-02-14 12:29:35 -05:00
lotte
9c3f226599 Merge branch 'master' into configurable_entities 
Conflicts:
	src/app/+collection-page/collection-page.component.ts
	src/app/+item-page/full/full-item-page.component.ts
	src/app/+item-page/simple/item-page.component.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
	src/app/+search-page/search-page.component.spec.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-results/search-results.component.spec.ts
	src/app/+search-page/search-results/search-results.component.ts
	src/app/+search-page/search-service/search-configuration.service.spec.ts
	src/app/+search-page/search-service/search-configuration.service.ts
	src/app/+search-page/search-service/search.service.ts
	src/app/core/cache/builders/remote-data-build.service.spec.ts
	src/app/core/cache/builders/remote-data-build.service.ts
	src/app/core/data/data.service.ts
	src/app/core/metadata/metadata.service.ts
	src/app/core/shared/item.model.ts
	src/app/core/shared/operators.ts
	src/app/shared/loading/loading.component.ts
	src/app/shared/object-collection/object-collection.component.ts
	src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
	src/app/shared/services/route.service.spec.ts
	src/app/shared/services/route.service.ts
	src/app/shared/shared.module.ts
	src/app/shared/testing/hal-endpoint-service-stub.ts
	src/app/shared/testing/search-service-stub.ts
	yarn.lock
 2018-12-10 11:13:01 +01:00
Kristof De Langhe
3a23b703d5 Merge branch 'master' into entities-master 
Conflicts:
	src/app/core/cache/models/normalized-object-factory.ts
	src/app/core/data/base-response-parsing.service.ts
	src/app/core/shared/operators.ts
	src/app/shared/object-list/item-list-element/item-list-element.component.html
	src/app/shared/shared.module.ts
 2018-10-10 14:28:18 +02:00
lotte
e025f3bc4d Merge branch 'master' into resolvers-branch-angular6 
Conflicts:
	package.json
	src/app/+search-page/search-filters/search-filters.component.ts
	src/app/core/auth/auth.effects.ts
	src/app/core/auth/auth.service.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/data/comcol-data.service.ts
	src/app/core/data/community-data.service.ts
	src/app/core/data/data.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/header/header.component.spec.ts
	src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
	src/app/shared/testing/auth-service-stub.ts
	yarn.lock
 2018-10-08 12:28:08 +02:00
Kristof De Langhe
addea8bf0e Merge branch 'master' into entities-master 
Conflicts:
	src/app/+item-page/full/full-item-page.component.ts
	src/app/+item-page/simple/item-page.component.html
	src/app/+item-page/simple/item-page.component.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
	src/app/+search-page/search-options.model.ts
	src/app/+search-page/search-page.component.html
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/+search-page/search-results/search-results.component.ts
	src/app/+search-page/search-service/search.service.spec.ts
	src/app/+search-page/search-service/search.service.ts
	src/app/+search-page/search-settings/search-settings.component.ts
	src/app/core/cache/response-cache.models.ts
	src/app/core/core.module.ts
	src/app/core/data/search-response-parsing.service.ts
	src/app/core/shared/operators.ts
	src/app/core/shared/resource-type.ts
	src/app/shared/object-collection/object-collection.component.spec.ts
	src/app/shared/object-collection/object-collection.component.ts
	src/app/shared/object-collection/shared/dso-element-decorator.spec.ts
	src/app/shared/object-collection/shared/dso-element-decorator.ts
	src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
	src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.ts
	src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
	src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
	src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.ts
	src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.ts
	src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
	src/app/shared/object-list/community-list-element/community-list-element.component.ts
	src/app/shared/object-list/item-list-element/item-list-element.component.html
	src/app/shared/object-list/item-list-element/item-list-element.component.ts
	src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
	src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts
	src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.ts
	src/app/shared/services/route.service.ts
	src/app/shared/shared.module.ts
	src/app/shared/testing/hal-endpoint-service-stub.ts
	src/app/shared/testing/search-service-stub.ts
	src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
	src/app/shared/view-mode-switch/view-mode-switch.component.ts
	src/app/thumbnail/thumbnail.component.html
 2018-09-17 14:10:46 +02:00
lotte
f11d486d14 updated angular/rxjs to v6 successfully 2018-08-31 15:40:39 +02:00
lotte
777facf5cd intermediate commit 2018-08-29 15:12:01 +02:00
Kristof De Langhe
3a53595573 Merge branch 'browse-by-features' of https://github.com/atmire/dspace-angular into browse-by-features 
Conflicts:
	src/app/core/data/data.service.spec.ts
 2018-08-29 14:40:38 +02:00
Kristof De Langhe
4590264d5a Merge branch 'master' into browse-by-features 
Conflicts:
	src/app/core/core.module.ts
	src/app/core/shared/operators.ts
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.html
	src/app/shared/object-list/item-list-element/item-list-element.component.html
	src/app/shared/shared.module.ts
 2018-08-29 14:24:45 +02:00
lotte
2cbe6a6d91 upgrade to angular6 2018-08-24 13:26:43 +02:00
lotte
a124e17782 Merge branch 'master' into browse-by-features 
Conflicts:
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.html
	src/app/shared/object-list/item-list-element/item-list-element.component.html
 2018-08-16 14:48:58 +02:00
lotte
8c5366705d Merge branch 'master' into search-features 
Conflicts:
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
 2018-08-10 11:01:18 +02:00
Kristof De Langhe
883a1d8881 Issues 252,253: Browse by title and browse by metadata (author) 2018-08-08 11:36:42 +02:00
lotte
3fa70523ea Fixed issue #1 and some other fixes 2018-07-30 10:19:45 +02:00
Lotte Hofstede
f4fde748dc resolved issue where the grid view of the search page would break when an item did not have a issue date 2018-06-13 09:39:24 +02:00
Art Lowel
06d2ac74be added custom item page fields for Projects, OrgUnits and People 2018-05-28 17:22:17 +02:00
Art Lowel
ebbe2e6a93 added tests for the new object-grid-component onInit code 2018-04-26 15:51:36 +02:00
Art Lowel
5e2dc51828 replaced css with bootstrap classes 2018-04-26 13:27:15 +02:00
Art Lowel
994c089925 fixed a few sorting, rpp and view persistence issues with grid view 2018-04-26 10:57:12 +02:00
Lotte Hofstede
6c2a249fdd test fixes 2018-03-15 16:15:02 +01:00
Lotte Hofstede
2435b484ce search backend fixes #1 2018-03-08 15:40:28 +01:00
Lotte Hofstede
7c873905e8 Merge branch 'master' into w2p-46063_truncation-implementation 
Conflicts:
	src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
	src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
	src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
	src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
	src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts
 2018-02-13 15:51:30 +01:00
Lotte Hofstede
c9071bc067 ts lint fixes 2018-02-13 15:47:06 +01:00
Lotte Hofstede
2895bb61e8 fixed list element tests 2018-02-13 15:06:07 +01:00
Lotte Hofstede
7bf23d1b7a 466063: test fixes 2018-02-08 14:39:13 +01:00
Lotte Hofstede
5f76bba050 46063: truncation finished, still have to fix some existing tests 2018-02-05 11:32:26 +01:00
Lotte Hofstede
58a26c03cc 46063: removed ellipsis, added other animations.. 2018-01-25 14:01:02 +01:00
Lotte Hofstede
1b0fc45b6d 46063: working CSS truncation, but were switching to JS again... 2018-01-24 15:22:31 +01:00
Art Lowel
643b715da2 fix lint issues 2018-01-23 15:18:11 +01:00
Art Lowel
107a0736c6 Angular 5 upgrade: upgrade dependencies - AoT build broken 2018-01-22 17:02:35 +01:00
Art Lowel
ab570e4ffb Merge branch 'master' into post-support 2018-01-17 15:34:54 +01:00
Jonas Van Goolen
4a56bd0f14 #150 Feedback fixes 2017-12-19 10:41:35 +01:00
Jonas Van Goolen
1f873acea4 #150 TSLint error fixing 2017-12-01 13:09:48 +01:00
Jonas Van Goolen
27ae938153 #150 Avoid first "null" download for initial content 2017-12-01 09:59:35 +01:00
Jonas Van Goolen
db0db81c63 #150 Generalised AbstractListableElementComponent instead of grid/list specific implementations 2017-12-01 09:59:35 +01:00
Jonas Van Goolen
d1b225bd95 #150 Merge fixes 2017-12-01 09:59:35 +01:00
Jonas Van Goolen
ee099e275c #150 Removal of iml file + small margin between pagination and grid 2017-12-01 09:59:35 +01:00