Art Lowel
|
8c1874c584
|
rename 'entity' to 'item'
|
2019-01-16 15:34:01 +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 |
|
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 |
|
lotte
|
ac4a1b179b
|
53881: facet search box
|
2018-07-02 15:27:13 +02:00 |
|
Kristof De Langhe
|
f50e0edbc0
|
52213: Item lists: displayed metadata journal-types
|
2018-05-31 12:40:05 +02:00 |
|
Art Lowel
|
8423261cc7
|
w2p 51851 - finished relation display on entity pages
|
2018-05-30 17:43:24 +02:00 |
|
Art Lowel
|
e5fc17da76
|
w2p 51849 - display entities as list results
|
2018-05-30 15:22:43 +02:00 |
|
Giuseppe Digilio
|
1e4bc0563a
|
Merge remote-tracking branch 'remotes/origin/master' into dynamic_forms
# Conflicts:
# src/app/app.reducer.ts
# src/app/core/core.module.ts
# src/app/shared/shared.module.ts
|
2018-05-15 18:44:51 +02:00 |
|
Giuseppe Digilio
|
478cbaf57c
|
Merge remote-tracking branch 'remotes/origin/master' into authentication
# Conflicts:
# src/app/app.effects.ts
# src/app/app.module.ts
# src/app/app.reducer.ts
# src/app/core/core.module.ts
# src/app/shared/shared.module.ts
|
2018-05-15 17:01:26 +02:00 |
|
Michael Marttila
|
b60373e290
|
Add MockAdminGuard as provider
|
2018-05-14 11:25:35 -04:00 |
|
Giuseppe Digilio
|
a114650564
|
fixes and adjustments
|
2018-05-09 19:23:09 +02:00 |
|
Giuseppe Digilio
|
7a32d18b1b
|
Merged dynamic form module
|
2018-05-09 12:14:18 +02:00 |
|
Lotte Hofstede
|
ce08f52b94
|
Finished date widget without tests and with AoT error
|
2018-05-09 09:32:07 +02:00 |
|
Lotte Hofstede
|
e7054af1d5
|
49440: date widget with decorator
|
2018-04-16 09:28:36 +02:00 |
|
Giuseppe Digilio
|
beb5e97158
|
Merge remote-tracking branch 'remotes/origin/master' into authentication
# Conflicts:
# package.json
# src/app/app.reducer.ts
# src/app/shared/shared.module.ts
|
2018-03-08 10:18:33 +01:00 |
|
Giuseppe Digilio
|
39eeec5385
|
Merge remote-tracking branch 'remotes/origin/master' into notification
# Conflicts:
# src/app/app.reducer.ts
# src/app/shared/shared.module.ts
|
2018-03-06 10:20:52 +01:00 |
|
Andrea Chiapparelli - 4Science
|
8c555292ac
|
notification start
|
2018-03-02 16:19:15 +01:00 |
|
Lotte Hofstede
|
52781d02c4
|
drag/click differensiating directive + fix for fixedheight truncatable elements
|
2018-02-13 11:50:35 +01:00 |
|
Giuseppe Digilio
|
19c9482009
|
Added first release of the authentication module
|
2018-02-06 15:48:05 +01:00 |
|
Giuseppe Digilio
|
2309c1be3b
|
Added login page ang nav menu
|
2018-02-01 17:13:08 +01:00 |
|
Lotte Hofstede
|
1b0fc45b6d
|
46063: working CSS truncation, but were switching to JS again...
|
2018-01-24 15:22:31 +01:00 |
|
Lotte Hofstede
|
136edddbdd
|
Merge branch 'master' into w2p-46063_truncation-implementation
Conflicts:
src/app/object-list/item-list-element/item-list-element.component.ts
src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss
src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts
src/styles/_custom_variables.scss
src/styles/_mixins.scss
|
2018-01-23 10:27:25 +01:00 |
|
Lotte Hofstede
|
33e04fd324
|
46063: saved currect state
|
2018-01-23 10:21:35 +01:00 |
|
Lotte Hofstede
|
f381649112
|
46063: css attempt to fix multiline clamping
|
2017-12-20 12:38:59 +01:00 |
|
Lotte Hofstede
|
eb2143d0a1
|
46063: overflow-text-clamp wrapper attempt
|
2017-12-20 08:55:45 +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
|
520b7f3e12
|
#150 Moved list,grid and object-collection to shared package
|
2017-12-01 09:59:35 +01:00 |
|
Jonas Van Goolen
|
e7e129f80f
|
#150 Intermediate commit
|
2017-12-01 09:59:35 +01:00 |
|
Jonas Van Goolen
|
a704157c1f
|
#150 Initial grid/list view implementation
|
2017-12-01 09:59:35 +01:00 |
|
Lotte Hofstede
|
71a8ed05d1
|
46063: object list truncation start
|
2017-11-24 10:45:50 +01:00 |
|
Lotte Hofstede
|
57c525d178
|
solved merge issues
|
2017-11-08 16:26:36 +01:00 |
|
Lotte Hofstede
|
1ff29621af
|
Merge branch 'master' into w2p-45621_filter-facets-ui
Conflicts:
src/app/+search-page/search-page.component.html
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.html
src/app/+search-page/search-service/search.service.ts
src/app/shared/search-form/search-form.component.html
src/app/shared/shared.module.ts
|
2017-11-08 16:08:59 +01:00 |
|
Lotte Hofstede
|
532741d073
|
45621: filter components for sidebar
|
2017-11-06 14:27:48 +01:00 |
|
Lotte Hofstede
|
7d5dad94a1
|
44988: added reducer, angular animation, tests...
|
2017-10-30 17:04:52 +01:00 |
|
Art Lowel
|
ce330fcb47
|
refactored template variables
|
2017-10-27 17:57:28 +02:00 |
|