Art Lowel
f531bdd976
Merge pull request #563 from 4Science/fix_store_selectors
...
Fix history and bitstreamFormats store selector after moved in CoreState
2020-01-17 13:59:24 +01:00
Giuseppe Digilio
ddb787277b
Fix failed test
2020-01-17 13:08:26 +01:00
Kristof De Langhe
7b3a2e9dc8
Merge branch 'master' into w2p-67611_Convert-external-source-to-entity
...
Conflicts:
src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
src/app/shared/shared.module.ts
2020-01-16 17:54:12 +01:00
Giuseppe Digilio
f630898eab
Merge remote-tracking branch 'remotes/origin/master' into fix_store_selectors
2020-01-16 16:14:19 +01:00
Tim Donohue
1ca1fe746a
Merge pull request #534 from atmire/reorder-name-variants
...
Reordering related entities in the submission
2020-01-16 08:49:29 -06:00
Ben Bosman
323ac03e54
Merge remote-tracking branch 'community/master' into mydspace-display-entity-type
2020-01-16 14:50:58 +01:00
Kristof De Langhe
3fd4ecbfc4
67611: ExpressionChangedAfterItHasBeenCheckedError fix
2020-01-16 14:47:37 +01:00
Ben Bosman
17989667aa
Merge remote-tracking branch 'community/master' into submission-upload.required
2020-01-16 14:32:43 +01:00
Ben Bosman
cc1cc08d8e
Merge remote-tracking branch 'community/master' into generic-uri-metadata
2020-01-16 14:16:25 +01:00
Kristof De Langhe
010da52476
Merge branch 'master' into w2p-67611_Convert-external-source-to-entity
2020-01-16 13:59:38 +01:00
Ben Bosman
4a2e7741b7
Merge remote-tracking branch 'community/master' into submit-this-collection
...
# Conflicts:
# src/app/submission/submission.service.ts
2020-01-16 12:53:59 +01:00
Ben Bosman
6010316d91
Merge remote-tracking branch 'community/master' into submit-this-collection
2020-01-16 12:51:46 +01:00
lotte
4c23d01567
Merge branch 'master' into reorder-name-variants
2020-01-16 09:30:31 +01:00
Tim Donohue
16831decca
Merge pull request #551 from 4Science/pagination-on-community-page
...
Pagination on community page
2020-01-15 11:48:32 -06:00
Tim Donohue
fd3eea99b8
Merge pull request #539 from atmire/Search-external-sources
...
Lookup relations - Search external sources
2020-01-15 11:22:40 -06:00
Kristof De Langhe
32a7dcd787
Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2
2020-01-15 17:01:39 +01:00
Tim Donohue
cd39d47214
Merge pull request #562 from atmire/travis-dist-upgrade
...
Upgrade Travis image to 'bionic'
2020-01-15 09:55:36 -06:00
Giuseppe Digilio
4e8ec5f4a2
Fix history and bitstreamFormats store selector after moved in CoreState
2020-01-15 12:14:53 +01:00
Art Lowel
94a71b69d1
remove chrome source, doesn't work anyway and doesn't seem to be needed. Remove chromium to try to solve the issue where travis can't find chrome
2020-01-15 11:56:04 +01:00
Art Lowel
1d6e9d5b96
add xvfb service for headless chrome
2020-01-15 11:32:29 +01:00
Art Lowel
2e06357291
upgrade to bionic
2020-01-15 11:12:49 +01:00
Kristof De Langhe
813fcfbd30
Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2
2020-01-15 10:02:30 +01:00
Tim Donohue
db4408274e
Merge pull request #561 from atmire/tslint-rule-renaming
...
Fixed renamed TSLint rules
2020-01-14 09:11:47 -06:00
lotte
0271821305
updated tslint rules that have been renamed
2020-01-14 14:50:46 +01:00
lotte
78f9d62e00
fixed linting error
2020-01-14 14:42:14 +01:00
lotte
1bc7182372
fixes after merge
2020-01-14 14:04:42 +01:00
Kristof De Langhe
9d71f0348b
67611: fix test
2020-01-14 13:38:01 +01:00
Kristof De Langhe
d8bdd768ca
Merge branch 'w2p-67478_Search-external-sources-in-submission' into w2p-67611_Convert-external-source-to-entity
2020-01-14 13:07:24 +01:00
Kristof De Langhe
617bbbb90c
67478: Remove redundant test
2020-01-14 12:52:50 +01:00
Samuel
9563ceb348
Merge branch 'master' into Virtual-metadata-on-item-delete
2020-01-14 12:51:54 +01:00
Kristof De Langhe
4ba3b01997
Merge branch 'master' into w2p-67478_Search-external-sources-in-submission
...
Conflicts:
src/app/core/data/data.service.ts
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
2020-01-14 12:46:55 +01:00
lotte
02802c0de1
Merge branch 'master' into reorder-name-variants
2020-01-14 12:40:39 +01:00
Samuel
2c1337031d
Merge branch 'master' into Keep-virtual-metadata-on-relationship-delete
2020-01-14 12:01:30 +01:00
Art Lowel
6e928eeb89
Merge pull request #547 from 4Science/upgrade-angular-7
...
Upgrade angular 7
2020-01-14 11:41:18 +01:00
Giuseppe Digilio
a3b349b6a3
Added test for SidebarFilterService
2020-01-13 13:04:09 +01:00
Giuseppe Digilio
0730c68654
use test for undefined Menu Section
2020-01-13 12:48:42 +01:00
Giuseppe Digilio
24015b2f95
use MockStore to provide test for menuKeySelector function
2020-01-13 11:58:12 +01:00
Giuseppe Digilio
d47a8fc572
commit yarn.lock
2020-01-13 11:14:49 +01:00
Giuseppe Digilio
ec9e0407df
Merge branch 'dependabot/npm_and_yarn/handlebars-4.5.3' into upgrade-angular-7
2020-01-13 10:45:43 +01:00
Giuseppe Digilio
ff80afb839
Moved history state from AppState to CoreState
2020-01-13 10:25:16 +01:00
Giuseppe Digilio
11e4f02946
Moved BitstreamFormatRegistryState from AppState to CoreState
2020-01-13 09:50:01 +01:00
Ben Bosman
70b2c8c6e1
go back to the setup where mockUploadConfigResponseNotRequired starts from a clone
2020-01-10 18:30:23 +01:00
Ben Bosman
3a37f9be12
submit to this collection
2020-01-10 18:15:28 +01:00
Samuel
de0992bf85
PR-533 Virtual metadata on item delete
2020-01-10 17:00:32 +01:00
lotte
3e51fd8598
fixed test issue
2020-01-10 16:36:47 +01:00
Marie Verdonck
d3d2bb20d4
id css selector added to remove ambiguity in search-page e2e tests
2020-01-10 15:28:57 +01:00
Marie Verdonck
c57810f00d
Timeout time for e2e tests
2020-01-10 15:04:52 +01:00
Marie Verdonck
34fb8612f8
Expandable search form in header with tests (& e2e tests)
...
Squashed:
66021: Expandable search form in header
66021: Adjustment small screens
66021: search icon now pressable and css partially moved to bootstrap classes
66021: start testing of header search box; TODO fix e2e
66021: E2E Tests
66021: Header search box now with angular animation and bootstrap > css; e2e fix
66021: feedback 2019-12-19 style changes
66021: Fix navbar search tests
Patch: add opacity to header search animation Change the input style
66021: expandable search navbar - tests
66021: Expandable search form in header
Small fix after rebasing upstream/master
2020-01-10 14:58:13 +01:00
Samuel
7b337acc1c
PR-530 repair tests
2020-01-10 11:59:33 +01:00
Samuel
4f57d7ae83
Merge branch 'master' into Keep-virtual-metadata-on-relationship-delete
2020-01-09 17:55:18 +01:00
