hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,291 Commits 24 Branches 25 Tags
a970aeaab86a9d10b649045a11571c44d08eab61
Commit Graph

3291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Samuel
4e679ec6db PR-530 Keep virtual metadata on relationship delete - community feedback 2020-01-09 13:53:42 +01:00
Kristof De Langhe
894888fc8f Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2 
Conflicts:
	resources/i18n/en.json5
	src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts
	src/app/+community-page/edit-community-page/edit-community-page.component.ts
	src/app/shared/shared.module.ts
 2020-01-09 10:34:08 +01:00
Ben Bosman
feced9f893 submit to this collection 2020-01-08 17:41:29 +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
lotte
f9fa8f0347 added typedoc 2020-01-08 10:34:24 +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
Ben Bosman
bb87bf5a0e display the entity type in myDSpace 2020-01-07 18:26:26 +01: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
Kristof De Langhe
b1575b3336 67611: Remove redundant test 2020-01-06 16:08:43 +01:00
Kristof De Langhe
5de567b8b0 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
 2020-01-06 13:24:20 +01:00