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
2,262 Commits 24 Branches 25 Tags
3a68b6dd7b2dbb77e5f5a654350c4b4a61cc74d5
Commit Graph

2262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Donohue
3a68b6dd7b Merge pull request #474 from atmire/master-travis-test-fixes 
master travis test fixes
 2019-09-05 18:50:53 +02:00
Kristof De Langhe
6c4d461ade master travis test fixes 2019-09-05 18:24:03 +02:00
Art Lowel
f9c5768ee3 Merge pull request #443 from atmire/UI-language-cookie 
UI language cookie
 2019-09-05 17:22:16 +02:00
benbosman
c4c6de66de Merge pull request #402 from atmire/Item-Relations-Edit-Delete 
Item relations edit delete
 2019-09-05 15:59:41 +02:00
Tim Donohue
36f134f1c6 Merge pull request #433 from atmire/Entities-grid-templates 
Entities grid templates
 2019-09-04 22:15:55 +02:00
Art Lowel
94eecffa88 Merge pull request #465 from lhenze/464-collpages-emptymessage 
Collection pages, recent submissions: Added "empty" message
 2019-09-04 17:56:29 +02:00
lhenze
64db1c242e New key created for *no recent items in this collection* 2019-09-03 17:02:09 -04:00
lhenze
79ccf2e2be Merge branch 'master' into 464-collpages-emptymessage 2019-09-03 16:24:32 -04:00
Art Lowel
ee56de9e55 Merge pull request #455 from atmire/Bitstream-format-registries 
Bitstream format registries
 2019-08-30 09:55:01 +02:00
Tim Donohue
c80542c280 Merge pull request #459 from atmire/edit-com-col-labels 
Fix the labels on edit collection and community pages
 2019-08-29 19:44:12 +02:00
Tim Donohue
7903a93042 Merge pull request #463 from lhenze/440-pagination-messaging 
Pagination messaging:  Hiding "Now Showing"
 2019-08-26 17:54:54 +02:00
lhenze
f49fab3599 Added "empty" message 
Modeled on browse-by.component.html
 2019-08-26 08:56:13 -04:00
lhenze
316ced7fef More compact approach h/t @artlowel 2019-08-26 07:47:11 -04:00
lhenze
064552188e Moving the ngIf directive to wrap both parts of the statement 2019-08-24 13:47:20 -04:00
Yana De Pauw
88c8fddbce Fix to message, margin and deletion page reset 2019-08-19 17:25:41 +02:00
Yana De Pauw
1d05680126 Implement feedback 
Change padding into margin
Change 'Create link' to a button
Add placeholder to extension field
Fix pagination
 2019-08-16 13:00:04 +02:00
Kristof De Langhe
7d0439b006 64225: Fixed AoT build errors 2019-08-14 16:00:26 +02:00
Kristof De Langhe
737792a1df 62741: Moved entity mantis files to correct location 2019-08-14 15:05:25 +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