Commit Graph

3045 Commits

Author SHA1 Message Date
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
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
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
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
Kristof De Langhe
617bbbb90c 67478: Remove redundant test 2020-01-14 12:52:50 +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
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
Giuseppe Digilio
34a4f211f1 Resolved AOT build errors 2020-01-08 17:19:02 +01:00
Giuseppe Digilio
5aca8cc87d Merge remote-tracking branch 'remotes/origin/master' into upgrade-angular-7
# Conflicts:
#	src/app/+collection-page/collection-form/collection-form.component.ts
#	src/app/+community-page/community-form/community-form.component.ts
#	src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
2020-01-08 17:18:43 +01:00
Tim Donohue
ad77640f7d Merge pull request #512 from atmire/Community-and-Collection-logos
Community and collection logos
2020-01-07 16:37:45 -06:00
Kristof De Langhe
42d12a83ce Merge branch 'master' into w2p-65240_Community-and-collection-logos
Conflicts:
	src/app/shared/shared.module.ts
2020-01-07 16:11:24 +01:00
dependabot[bot]
ebe64c2dcc Bump handlebars from 4.1.2 to 4.5.3
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.2 to 4.5.3.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2...v4.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-01-06 16:18:15 +00:00
Giuseppe Digilio
daeb475eb6 upgrade angulartics lib version 2020-01-02 10:47:27 +01:00
Giuseppe Digilio
75b4291789 Resolved type errors after merge 2019-12-24 16:35:20 +01:00
Giuseppe Digilio
ee8293978f Merge remote-tracking branch 'remotes/origin/master' into upgrade-angular-7
# Conflicts:
#	src/app/core/services/route.service.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
#	src/app/shared/form/builder/form-builder.service.ts
#	src/app/shared/object-list/object-list.component.spec.ts
#	src/app/submission/submission.service.ts
2019-12-24 15:57:06 +01:00
Giuseppe Digilio
c09010e151 Added test for TopLevelCommunityList Component 2019-12-23 17:23:43 +01:00
Giuseppe Digilio
b18cfcbd25 fixed issue with type of object emitted onPaginationChange event 2019-12-23 17:23:17 +01:00
Giuseppe Digilio
fcbb690b29 Added pagination to community's sub-community list in the community page 2019-12-23 15:55:03 +01:00
Giuseppe Digilio
e004098016 Added pagination to community's collection list in the community page 2019-12-23 15:54:25 +01:00
Giuseppe Digilio
ce004c2e58 Resolve conflict occurred when two or more pagination components are present in the same page 2019-12-23 15:54:05 +01:00
Tim Donohue
4b67dbf10f Merge pull request #544 from atmire/stop-parsing-stat-event-responses
Disregard the response body for statistic event calls
2019-12-20 13:56:05 -06:00
Tim Donohue
6b5303faa5 Merge pull request #531 from atmire/clean-relationships-in-submission
Create relationships during the submission
2019-12-20 13:34:32 -06:00
lotte
b510894f6f fixed edit submission bug 2019-12-20 17:01:39 +01:00
lotte
01ba97af7a applied feedback 2019-12-20 14:13:31 +01:00
lotte
7c39bf4b5f fixed bug where removing a filter in the submission relationship modal redirects to the homepage 2019-12-20 10:15:24 +01:00
Giuseppe Digilio
83fabb007a fixed issue with refresh page when user is already authenticated 2019-12-19 19:01:22 +01:00
Giuseppe Digilio
62b555beee fixed vulnerabilty with serialize-javascript 2019-12-19 18:22:35 +01:00
lotte
d352443848 reverted server change 2019-12-19 15:36:04 +01:00
Giuseppe Digilio
8ecb215105 Updated yarn.lock 2019-12-19 14:41:13 +01:00
Giuseppe Digilio
850f474c28 updated @ngx-translate 2019-12-19 14:40:08 +01:00
Giuseppe Digilio
2a26159af6 added eslint to dev dependencies 2019-12-19 13:58:55 +01:00
Giuseppe Digilio
be445a7bde Fixed error with UglifyJsPlugin during AOT build after upgrade to angular 7 2019-12-19 13:58:24 +01:00
Giuseppe Digilio
66834bb279 remove resolve-url-loader after upgrade to angular 7 2019-12-19 13:57:51 +01:00
lotte
00039436b6 more tests 2019-12-19 13:57:44 +01:00
Giuseppe Digilio
bc72b1c2ae Fixed webpack loaders version 2019-12-19 13:56:54 +01:00
Giuseppe Digilio
6b123ad0a7 Fixed dropdown login menu after upgrade to angular 7 2019-12-19 13:55:34 +01:00
Giuseppe Digilio
2022268ab0 Fixed AOT build after upgrade to angular 7 2019-12-19 13:55:02 +01:00
Kristof De Langhe
890d60aa9c 67478: External source link + pagination fix 2019-12-19 13:13:46 +01:00
Kristof De Langhe
904228127e Merge remote-tracking branch 'atmire/clean-relationships-in-submission' into w2p-67478_Search-external-sources-in-submission
Conflicts:
	src/app/+item-page/simple/related-items/related-items-component.ts
	src/app/+search-page/configuration-search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/+search-page/search-tracker.component.ts
	src/app/+search-page/search.component.ts
	src/app/app.reducer.ts
	src/app/core/data/data.service.ts
	src/app/core/data/relationship.service.ts
	src/app/core/services/route.service.ts
	src/app/core/utilities/equatable.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
	src/app/shared/form/builder/models/relationship-options.model.ts
2019-12-19 11:55:28 +01:00