Commit Graph

3210 Commits

Author SHA1 Message Date
Kristof De Langhe
431d7e12b1 62589: Clean build folder pre-tests 2019-09-06 14:09:21 +02:00
Julius Gruber
92f8a5d522 Typo in dropdown-field-parser.ts fixed 2019-09-06 13:22:43 +02:00
Kristof De Langhe
7fe0db7d7c Merge branch 'master' into w2p-62589_Item-mapper-update
Conflicts:
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
	src/app/+search-page/search-service/search.service.ts
2019-09-06 12:52:36 +02:00
Kristof De Langhe
e90e550f8f Merge branch 'master' into w2p-64574_Item-page-entities 2019-09-06 11:38:12 +02:00
Kristof De Langhe
6ffd791f12 64574: Further mantis template fixes 2019-09-06 11:35:20 +02:00
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
Kristof De Langhe
adcefbae17 64574: Update mantis item pages with new template 2019-09-05 17:34:13 +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
L. Henze
f443a2bcce Excess whitespace removed 2019-09-05 10:52:05 -04:00
Giuseppe Digilio
5a3eb8c9df Merge remote-tracking branch 'remotes/origin/master' into submission-miscellaneous-fixes
# Conflicts:
#	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
2019-09-05 16:35:32 +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
Kristof De Langhe
e6a051e9c6 Merge branch 'master' into w2p-64574_Item-page-entities 2019-09-05 15:43:59 +02:00
Giuseppe Digilio
67b09e3794 Merge remote-tracking branch 'remotes/origin/master' into submission-miscellaneous-fixes
# Conflicts:
#	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
2019-09-05 14:54:27 +02:00
Kristof De Langhe
04f57b753e Merge branch 'master' into w2p-62589_Item-mapper-update
Conflicts:
	src/app/app.reducer.ts
	src/app/shared/shared.module.ts
2019-09-05 14:16:13 +02:00
lotte
9723d929e1 resolved issues after merge with master 2019-09-05 10:44:37 +02:00
lotte
b634799ef9 Merge branch 'master' into w2p-62355_optimize-search-performance 2019-09-05 10:16:51 +02:00
lhenze
20bc4d1c2d tidying - whitespace only 2019-09-04 17:12:52 -04:00
Tim Donohue
36f134f1c6 Merge pull request #433 from atmire/Entities-grid-templates
Entities grid templates
2019-09-04 22:15:55 +02:00
lhenze
2845578d07 Tidying 2019-09-04 16:13:39 -04:00
lhenze
d6bcdda8a0 Adding i18n keys for the labels for handles 2019-09-04 14:57:26 -04:00
lhenze
50c3c4133f Merge branch 'master' into 460-coll-pages 2019-09-04 14:34:04 -04: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
lotte
11ad52c120 finished second selection tab 2019-09-04 15:45:08 +02:00
lotte
77e2fde15a added selected results to lookup tab 2019-09-04 08:47:32 +02:00
lhenze
f609476270 New key 2019-09-03 17:19:13 -04:00
lhenze
ba89698509 Merge branch 'master' into 460-coll-pages 2019-09-03 17:03:21 -04: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
Kristof De Langhe
e59b0929ed 64503: Default metadataConfigID 2019-09-03 16:11:31 +02:00
lotte
3018845d0a created new tab for lookup 2019-09-03 15:42:42 +02:00
lotte
4ace067265 changed labels for input groups 2019-09-03 14:15:36 +02:00
Kristof De Langhe
7432297dce 64503: Fetch harvester endpoint using halService + small unsubscribe fix 2019-09-03 11:19:23 +02:00
Terry Brady
b68c59b835 Updating comments per review 2019-09-01 16:25:26 -07:00
lotte
5142915e83 created tabs, working on concat field lookups 2019-08-30 16:17:43 +02:00
Yana De Pauw
343a1498ac Prevent navigation by link from collection-list component 2019-08-30 15:41:50 +02: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
Terry Brady
c8fafd067e run e2e tests in docker using docker-compose 2019-08-29 09:15:12 -07:00
Yana De Pauw
22df3ec7f2 64644: Removal of filtered discovery page 2019-08-29 16:33:38 +02:00
lotte
addc6618ba solved issues with radiobuttons 2019-08-29 16:29:55 +02:00
Yana De Pauw
f955998d8b 64644: Removal of filtered discovery page 2019-08-29 16:03:37 +02:00
lotte
fa86601f55 applied feedback 2019-08-29 13:36:24 +02:00
lotte
3f0e5865f9 solved bug where equal objects were't compared by their properties 2019-08-29 13:15:52 +02:00
lotte
c117af34c3 Merge branch 'w2p-64574_Item-page-entities' into w2p-62849_relationships-in-submission 2019-08-29 10:32:57 +02:00
Kristof De Langhe
7233482fe7 64574: Fix AoT error 2019-08-29 10:32:28 +02:00
lotte
85279c5601 solved tests 2019-08-28 16:58:21 +02:00
lotte
dc3302e73b Merge branch 'w2p-64574_Item-page-entities' into w2p-62849_relationships-in-submission 2019-08-28 14:28:06 +02:00
lotte
35056959bb test fixes 2019-08-28 13:05:46 +02:00
Kristof De Langhe
76636933e4 64574: Test fixes 2019-08-28 12:01:24 +02:00