Art Lowel
|
8996716d71
|
Merge remote-tracking branch 'upstream/master' into configurable_entities
|
2019-03-29 13:23:05 +01:00 |
|
Tim Donohue
|
f396da34b4
|
Merge branch 'master' into configurable_entities
|
2019-03-15 15:11:53 -05: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
|
0a1138fbbd
|
Merge branch 'master' into w2p-60113_admin-select-dso-modal
Conflicts:
src/app/shared/shared.module.ts
|
2019-03-08 16:40:52 +01:00 |
|
lotte
|
31d24284fb
|
added tests for popups
|
2019-03-07 14:25:52 +01:00 |
|
lotte
|
9abbfa955e
|
refactored, started tests
|
2019-03-07 14:25:48 +01:00 |
|
lotte
|
9f02f65a0a
|
implemented edit popups and added actions
|
2019-03-07 14:24:51 +01:00 |
|
lotte
|
61a5620efe
|
refactored lookup
|
2019-03-07 14:24:24 +01:00 |
|
lotte
|
bc305e2aa6
|
60113: context sensitive popup started from submission branch
|
2019-03-07 14:23:02 +01:00 |
|
Kristof De Langhe
|
d5fe5c432b
|
Merge branch 'master' into Browse-By-Date
Conflicts:
config/environment.default.js
src/config/global-config.interface.ts
|
2019-03-04 11:15:49 +01:00 |
|
lotte
|
c40179fc88
|
Merge branch 'master' into w2p-59334_edit-item-metadata-branch
Conflicts:
src/app/+community-page/community-page.component.ts
src/app/core/auth/server-auth.service.ts
src/app/core/data/dso-response-parsing.service.ts
src/app/core/data/item-data.service.ts
src/app/core/data/metadata-schema-data.service.ts
src/app/core/data/request.models.ts
src/app/core/metadata/metadata.service.spec.ts
src/app/core/metadata/normalized-metadata-schema.model.ts
src/app/core/shared/metadatum.model.ts
src/app/core/shared/operators.spec.ts
src/app/shared/shared.module.ts
|
2019-02-25 10:28:18 +01:00 |
|
Kristof De Langhe
|
fe5f436654
|
Merge branch 'master' into w2p-60168_Alphabetic-browse-widget
Conflicts:
src/app/core/browse/browse.service.spec.ts
src/app/core/browse/browse.service.ts
src/app/core/data/dso-response-parsing.service.ts
src/app/shared/shared.module.ts
|
2019-02-21 13:35:21 +01:00 |
|
Kristof De Langhe
|
a0501b0c3c
|
60168: Refactor browse-by-starts-with components to starts-with components + further refactoring by seperating date from text
|
2019-02-20 09:24:07 +01:00 |
|
lotte
|
bfa1e77177
|
finalised edit item page
|
2019-02-19 10:13:49 +01:00 |
|
Kristof De Langhe
|
371f2bcd85
|
Merge remote-tracking branch 'atmire/master' into Browse-by-links
Conflicts:
src/app/core/browse/browse.service.spec.ts
src/app/core/data/dso-response-parsing.service.ts
src/app/shared/shared.module.ts
|
2019-02-13 13:25:35 +01:00 |
|
lotte
|
7eec961fa7
|
59334: edit item metadata finished
|
2019-02-13 11:39:32 +01:00 |
|
Kristof De Langhe
|
b956dbfe08
|
59695: Browse-By-Starts-With components and switcher
|
2019-02-11 17:30:05 +01:00 |
|
lotte
|
ace523ed14
|
intermediate commit for tests
|
2019-02-08 14:42:34 +01:00 |
|
Kristof De Langhe
|
0312e659a4
|
59415: Browse-By links on community and collection pages'
|
2019-01-29 16:07:53 +01:00 |
|
lotte
|
a733eb5834
|
Merge branch 'community-and-collection-forms' into w2p-58522_delete-collections-and-communities
Conflicts:
src/app/core/data/data.service.ts
src/app/shared/shared.module.ts
|
2019-01-24 12:58:05 +01:00 |
|
Art Lowel
|
160aba1249
|
Merge branch 'rename-entities' into mixing-text-authority-entities
|
2019-01-22 10:15:26 +01:00 |
|
Art Lowel
|
bd07b33ef2
|
Merge remote-tracking branch 'upstream/configurable_entities' into rename-entities
|
2019-01-22 10:04:18 +01:00 |
|
lotte
|
6dba02ca67
|
Merge branch 'master' into community-and-collection-forms
Conflicts:
src/app/core/data/item-data.service.spec.ts
src/app/core/data/item-data.service.ts
src/app/core/shared/operators.spec.ts
src/app/core/shared/operators.ts
src/app/shared/shared.module.ts
|
2019-01-22 08:34:51 +01:00 |
|
Tim Donohue
|
2e53c3e3cf
|
Merge branch 'master' into configurable_entities
|
2019-01-21 14:26:47 -06:00 |
|
Art Lowel
|
57999ad382
|
add the ability to mix text based metadata fields, authority controlled fields and typed items in the same section
|
2019-01-21 18:27:07 +01:00 |
|
Bram Luyten
|
17be7a34e0
|
Issue 298 Language switch
|
2019-01-16 20:01:14 +01:00 |
|
Art Lowel
|
95e9e9166a
|
rename ItemSearchResultComponent to prevent confusion with ItemSearchResultListElementComponent
|
2019-01-16 16:34:10 +01:00 |
|
Art Lowel
|
8c1874c584
|
rename 'entity' to 'item'
|
2019-01-16 15:34:01 +01:00 |
|
lotte
|
ab5cc1c961
|
58522: implemented delete for coll and comms
|
2019-01-04 16:30:25 +01:00 |
|
lotte
|
1ebd6f0e86
|
Finished refactoring, guards, docs, tests
|
2019-01-03 10:29:29 +01:00 |
|
lotte
|
a7bebb1035
|
upgrade to angular 6
|
2018-12-10 13:48:48 +01: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 |
|
lotte
|
07c9927b6a
|
finished dynamic menus
|
2018-12-06 15:50:12 +01:00 |
|
lotte
|
c17b395ba0
|
57053: intermediate commit active issue
|
2018-12-05 12:46:22 +01:00 |
|
lotte
|
0c4784346b
|
progress vertical menu
|
2018-11-14 15:56:23 +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
|
777facf5cd
|
intermediate commit
|
2018-08-29 15:12:01 +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 |
|
Kristof De Langhe
|
072507b293
|
improved coverage, type docs, removed startsWith option and general refactoring
|
2018-08-09 12:37:09 +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
|
117a0cd3ff
|
Merge branch 'master' into search-features
Conflicts:
package.json
src/app/shared/shared.module.ts
yarn.lock
|
2018-08-02 14:21:28 +02:00 |
|
lotte
|
3fa70523ea
|
Fixed issue #1 and some other fixes
|
2018-07-30 10:19:45 +02:00 |
|
lotte
|
cfc448332d
|
latest fixes for search page
|
2018-07-19 13:44:38 +02:00 |
|
lotte
|
2e04b542b8
|
Merge branch 'w2p-49440_Date-widget' into w2p-49440_date-widget-for-search-features
Conflicts:
package.json
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.html
src/app/+search-page/search-page.component.ts
src/app/+search-page/search-page.module.ts
src/app/shared/shared.module.ts
|
2018-07-17 10:09:07 +02:00 |
|
lotte
|
c62725a8bf
|
Merge branch 'w2p-54053_Active-filter-labels' into search-features
|
2018-07-12 14:59:42 +02:00 |
|
Giuseppe Digilio
|
10d90e4325
|
Merge remote-tracking branch 'remotes/origin/master' into dynamic_forms
# Conflicts:
# resources/i18n/en.json
# src/app/core/cache/response-cache.models.ts
# src/app/core/data/request.models.ts
# src/app/shared/shared.module.ts
# src/styles/_custom_variables.scss
|
2018-07-12 14:56:57 +02:00 |
|
lotte
|
3acd9d4f5e
|
Merge branch 'w2p-53881_facet-search-box' into search-features
Conflicts:
src/app/core/shared/resource-type.ts
src/app/shared/shared.module.ts
|
2018-07-12 14:54:42 +02:00 |
|
Kristof De Langhe
|
8931337d2d
|
54053: intermediate commit
|
2018-07-04 15:56:29 +02:00 |
|