Commit Graph

6690 Commits

Author SHA1 Message Date
Art Lowel
e12bb83441 Merge branch 'pr/116' into dso-list-component 2017-06-22 13:20:19 +02:00
Art Lowel
68aaf18185 Merge branch 'master' into dso-list-component 2017-06-22 13:09:43 +02:00
Art Lowel
ac58c8c2aa replace ng2-truncate with a naive own implementation, because ng2-truncate isnt compatible with the AoT build 2017-06-22 13:03:54 +02:00
Art Lowel
7b62c790ae fixed issues with retrieve 2017-06-22 10:59:35 +02:00
Art Lowel
12edec3471 added crude first recent items list to collection hompage - needs refactoring 2017-06-21 18:42:54 +02:00
Art Lowel
0dfe19af51 switched back to communities 2017-06-21 17:01:45 +02:00
Art Lowel
5e2bcc5f8f Merge branch 'live-rest-backend' into w2p-41914_DSO-list-component 2017-06-21 16:51:48 +02:00
Art Lowel
b46ad36eaf made use of embedded resources for relationships in the response that contain a single link for a set of resources rather than enumerate the self link of each resource 2017-06-21 16:51:37 +02:00
Art Lowel
9ab1750ca6 fixed an issue where the matrix URL pagination params would still be used 2017-06-21 16:44:49 +02:00
Art Lowel
96f3100288 Merge branch 'live-rest-backend' into w2p-41914_DSO-list-component 2017-06-21 11:31:05 +02:00
Art Lowel
0bccc7c201 fixed an issue where sometimes the wrong resource would be returned if it was fetched as part of a list, and later queried as a single resource 2017-06-21 11:30:48 +02:00
Giuseppe Digilio
0945c86a38 change thumbnail.component.ts 2017-06-20 17:28:35 +02:00
Giuseppe Digilio
32de03ee2d Change thumbnail.component.ts 2017-06-20 17:26:35 +02:00
Giuseppe Digilio
0d588a937d Resolve conflicts 2017-06-20 17:04:06 +02:00
Giuseppe Digilio
beec9ea206 Merge remote-tracking branch 'remotes/origin/master' into no-image
# Conflicts:
#	src/app/collection-page/collection-page.module.ts
#	src/app/collection-page/logo/collection-page-logo.component.html
#	src/app/collection-page/logo/collection-page-logo.component.ts
2017-06-20 16:07:56 +02:00
Giuseppe Digilio
5245fd6488 Show default image 2017-06-20 15:52:58 +02:00
Art Lowel
e17987b09b Merge branch 'live-rest-backend' into w2p-41914_DSO-list-component 2017-06-20 15:17:24 +02:00
Art Lowel
21a6a80d13 fixed issues with related resources that have a single link for a hasMany relationship (e.g. item.bitstreams) 2017-06-20 15:04:42 +02:00
Art Lowel
b04b103207 tweaks to the object lists 2017-06-20 14:27:35 +02:00
Art Lowel
429d4a8937 Merge branch 'live-rest-backend' into w2p-41914_DSO-list-component 2017-06-20 11:39:52 +02:00
Art Lowel
b69f2ff4cb updating tests 2017-06-20 11:22:26 +02:00
Art Lowel
145886e497 Merge branch 'master' into live-rest-backend 2017-06-19 18:18:33 +02:00
Art Lowel
923ad74c2f Merge pull request #115 from artlowel/bug-114-cache-issue
This merge closes #114
2017-06-19 15:56:26 +02:00
Art Lowel
f6550e2628 fixed issue where resources that were fetched from a list where not able to be rendered separately 2017-06-19 15:20:48 +02:00
Art Lowel
86d7b99010 Merge branch 'master' into live-rest-backend 2017-06-16 15:37:15 +02:00
Art Lowel
e37ea12e2d Merge pull request #108 from christian-scheible/community-home-page
Added community home page. This PR closes #89.
2017-06-16 14:47:46 +02:00
Christian Scheible
8c16918728 Added unsubscribe to community logo subscription. 2017-06-16 12:34:17 +02:00
Christian Scheible
f4dba7879b merged with master 2017-06-16 12:02:55 +02:00
Art Lowel
8663f27403 Merge pull request #113 from artlowel/bug-112-collection-homepage-errors
Fix Collection Homepage Errors
2017-06-16 10:55:25 +02:00
Lotte Hofstede
432039a2be 41914: implemented sort for pagination 2017-06-16 10:45:44 +02:00
Art Lowel
c6494d3de3 fixed an issue where incomplete mock data caused an error on collection homepages 2017-06-16 10:44:49 +02:00
Art Lowel
4325e569fd switched to 'retrieve' as the property for a bitstream's file url 2017-06-16 09:19:00 +02:00
Lotte Hofstede
a253509c5d 41914: implemented pagination sort direction/field 2017-06-15 13:35:04 +02:00
Lotte Hofstede
6db165b7a3 41914: implemented pagination sort direction/field 2017-06-15 13:32:15 +02:00
Lotte Hofstede
c63bd7c2ef 41914: Finished pagination feature for object list 2017-06-15 09:30:03 +02:00
Lotte Hofstede
818407635d Merge remote-tracking branch 'artlowel/live-rest-backend' into w2p-41914_DSO-list-component 2017-06-14 16:21:19 +02:00
Art Lowel
70c43b5fda added support for pagination in findAll rest calls 2017-06-14 16:18:54 +02:00
Lotte Hofstede
03208c8261 41914: DSO list with pagination from rest 2017-06-14 15:03:41 +02:00
Lotte Hofstede
3929a49c1d 41914: DSO list finished without item count 2017-06-14 13:51:38 +02:00
Art Lowel
fda5cc3b3b Merge branch 'master' into live-rest-backend 2017-06-14 13:31:27 +02:00
Art Lowel
3d4de8a5a0 Merge pull request #110 from 4Science/matrix-notation
remove Matrix URL notation
2017-06-14 11:04:04 +02:00
Art Lowel
ba62a646ac Merge pull request #99 from artlowel/rest-embedded
Support embedded resources in rest responses
2017-06-14 11:02:50 +02:00
Christian Scheible
ac7b2775e4 Renamed Collection/Community shared components 2017-06-13 15:41:38 +02:00
Christian Scheible
90840d949b Refactored collection/community logo and name as shared components. 2017-06-13 14:35:57 +02:00
Christian Scheible
3ad3df7568 Refactored community and collection pages to use a shared component for most of the content. This PR connect’s to #89 2017-06-13 10:02:49 +02:00
Giuseppe
06f3a4ff90 Create pagination.component.ts 2017-06-12 16:39:52 +02:00
Giuseppe Digilio
e3778afd45 Remove matrix URL notation in PaginationComponent 2017-06-12 16:35:14 +02:00
Art Lowel
84a3272e55 never push things on a friday night as you're about to leave ;) 2017-06-12 10:18:27 +02:00
Art Lowel
7e12b33151 fix merge isses 2017-06-09 18:32:47 +02:00
Art Lowel
9208aae03d Merge branch 'master' into rest-embedded 2017-06-09 18:09:29 +02:00