hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-15 05:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,301 Commits 23 Branches 25 Tags
ca048736b51ead7f90b3fdebe2ecc150c0f1fc81
Commit Graph

2301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lotte
62880336d9 Merge branch 'master' into w2p-62355_optimize-search-performance 2019-08-14 12:31:07 +02:00
Yana De Pauw
863189b2e5 fix missing , in messages file 2019-08-14 11:48:51 +02:00
Yana De Pauw
67feaf3178 Merge branch 'master' into Bitstream-format-registries 
Conflicts:
	resources/i18n/en.json
 2019-08-14 11:24:45 +02:00
Yana De Pauw
295bbc5c40 flatten en.json 2019-08-14 11:22:36 +02:00
Art Lowel
930da6dde3 fix the labels on edit collection and community pages 2019-08-13 15:13:51 +02:00
Kristof De Langhe
fc21dc2019 64225: Search results reloading correctly after object deletion 2019-08-13 14:46:10 +02:00
Kristof De Langhe
e05f44d079 64225: Import fix 2019-08-13 12:30:47 +02:00
Kristof De Langhe
9afcd48f12 Merge branch 'master' into w2p-64225_Relations-delete-feedback-3 
Conflicts:
	resources/i18n/en.json
	src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
	src/app/+search-page/search-service/search.service.ts
	src/app/core/core.module.ts
	src/app/core/shared/item.model.ts
 2019-08-13 12:03:29 +02:00
Kristof De Langhe
1be7f4e550 62741: Grid template field changes 2019-08-12 11:05:45 +02:00
Art Lowel
0ad505ba30 Merge pull request #442 from atmire/ConfigurationSearchPageComponent 
Configuration search page component
 2019-08-12 10:40:35 +02:00
Kristof De Langhe
2db0bf44f3 62741: PR Feedback changes 2019-08-12 10:22:49 +02:00
Tim Donohue
64b657507c Merge pull request #440 from atmire/Edit-current-item-query 
Edit current item query
 2019-08-09 22:48:09 +02:00
Tim Donohue
2fc6f9ea77 Merge pull request #457 from atmire/flatten-i18n-files 
Flatten i18n files
 2019-08-09 17:32:50 +02:00
Tim Donohue
3a7926eebe Merge pull request #454 from atmire/remove-e2e-from-ci 
Remove e2e tests from the ci task
 2019-08-08 22:14:04 +02:00
Art Lowel
746567ab52 Merge branch 'master' into flatten-i18n-files 2019-08-08 13:49:13 +02:00
Art Lowel
c81f589338 Update the Quick Start docs to include node 10 2019-08-06 17:41:22 +02:00
Yana De Pauw
c325e6d61b Merge branch 'master' into w2p-62769_Bitstream-format-registry 
Conflicts:
	src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
	src/app/core/core.module.ts
	src/app/core/registry/registry-bitstreamformats-response.model.ts
	src/app/core/registry/registry.service.ts
	src/app/core/shared/bitstream-format.model.ts
 2019-08-06 17:22:03 +02:00
Art Lowel
d1ba6ab610 restore protractor timeouts to their default values 2019-08-06 17:19:49 +02:00
Art Lowel
588fc484a4 remove e2e tests from the ci task 2019-08-06 17:08:43 +02:00
Tim Donohue
5221615c42 Merge pull request #452 from atmire/security-fixes 
Upgrade dependencies to prevent vulnerabilities
 2019-08-06 15:37:17 +02:00
Art Lowel
004f4ce38c increase protractor timeouts again 2019-08-06 14:40:53 +02:00
Art Lowel
1fb38fe56d increase protractor allScriptsTimeout 2019-08-06 13:31:32 +02:00
Art Lowel
dc868853a8 remove node 9, add node 10 2019-08-06 11:17:17 +02:00
Art Lowel
73f67827f3 upgrade dependencies to prevent CVE-2019-10744, CVE-2019-13173, CVE-2018-14732, CVE-2018-16469, CVE-2018-1000620, CVE-2019-10744 and WS-2018-0236 2019-08-05 18:23:27 +02:00
Yana De Pauw
279b80b4de 62769: Bitstream format registry 2019-08-05 13:14:03 +02:00
Art Lowel
0b4379abad Merge pull request #431 from DSpace/dependabot/npm_and_yarn/lodash.mergewith-4.6.2 
Bump lodash.mergewith from 4.6.1 to 4.6.2
 2019-08-02 17:23:59 +02:00
Art Lowel
2e4b9d7811 Merge pull request #422 from DSpace/dependabot/npm_and_yarn/ecstatic-3.3.2 
Bump ecstatic from 3.2.2 to 3.3.2
 2019-08-02 17:23:26 +02:00
Art Lowel
00858ae013 Merge pull request #415 from DSpace/dependabot/npm_and_yarn/handlebars-4.1.2 
Bump handlebars from 4.0.11 to 4.1.2
 2019-08-02 17:23:05 +02:00
Art Lowel
aed3e5ae46 Merge pull request #414 from DSpace/dependabot/npm_and_yarn/js-yaml-3.13.1 
Bump js-yaml from 3.12.0 to 3.13.1
 2019-08-02 17:22:44 +02:00
Art Lowel
3e8b12cb91 Merge pull request #412 from DSpace/dependabot/npm_and_yarn/pem-1.13.2 
Bump pem from 1.12.3 to 1.13.2
 2019-08-02 17:21:57 +02:00
Art Lowel
8148a67e40 double e2e jasmine timeout 2019-08-02 16:52:15 +02:00
Tim Donohue
f4f6c21abf Merge pull request #434 from atmire/object-factory-refactoring 
Replaced unnecessary model factories
 2019-08-01 23:13:06 +02:00
Tim Donohue
2c3c07ce52 Merge pull request #444 from atmire/Travis-webdriver-manager-temp-fix 
Patch protractor with the latest webdriver-manager
 2019-08-01 17:28:32 +02:00
Art Lowel
6043d16429 Merge branch 'Travis-webdriver-manager-temp-fix' into ConfigurationSearchPageComponent 2019-08-01 14:28:00 +02:00
Art Lowel
22fa4c6dae Merge branch 'Travis-webdriver-manager-temp-fix' into Edit-current-item-query 2019-08-01 14:27:11 +02:00
lotte
a891a319d8 Merge branch 'Travis-webdriver-manager-temp-fix' into object-factory-refactoring 2019-08-01 14:26:40 +02:00
Art Lowel
d320c703b1 Merge branch 'Travis-webdriver-manager-temp-fix' into UI-language-cookie 2019-08-01 14:25:10 +02:00
Art Lowel
16b8184dad patch protractor with the latest webdriver-manager 2019-08-01 13:54:34 +02:00
lotte
01198c3ac5 removed unnecessary static type in NormalizedWorkflowItem and fixed generic type for NormalizedWorkspaceItem 2019-08-01 13:26:54 +02:00
Kristof De Langhe
344f355995 Merge branch 'master' into w2p-63825_UI-language-cookie 2019-07-31 17:04:54 +02:00
Kristof De Langhe
6f347868ff Merge branch 'master' into w2p-63469_Relations-delete-feedback-2 
Conflicts:
	src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts
 2019-07-30 10:34:22 +02:00
Kristof De Langhe
ee11944645 Merge branch 'master' into w2p-63934_Edit-current-item-query 2019-07-29 11:03:55 +02:00
Kristof De Langhe
24a8e06ee7 Merge branch 'master' into w2p-63724_ConfigurationSearchPageComponent 2019-07-29 10:25:10 +02:00
Art Lowel
64a60f561e flatten i18n files 2019-07-26 11:09:06 +02:00
lotte
96bcb8c671 Merge branch 'master' into object-factory-refactoring 2019-07-26 08:53:11 +02:00
lotte
b442690350 Merge branch 'master' into w2p-62355_optimize-search-performance 2019-07-26 08:41:43 +02:00
Tim Donohue
81b19a96d7 Merge pull request #438 from DSpace/tdonohue-patch-1 
Update environment.js with new demo site path
 2019-07-25 18:19:31 +02:00
Tim Donohue
64c653feb9 Update environment.js with new demo site path 2019-07-25 10:53:19 -05:00
benbosman
5ca011e5fe Merge pull request #430 from atmire/One-Sided-Relationship-Filtering 
One-sided relationship filtering and refactoring
 2019-07-25 15:59:24 +02:00
lotte
d335ab71af added some typedoc 2019-07-25 15:23:29 +02:00