Commit Graph

372 Commits

Author SHA1 Message Date
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
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
Art Lowel
bdf6d006e7 parse page info from rest api and add it to remotedata objects 2017-06-09 17:43:26 +02:00
Christian Scheible
48c3cb4e46 #89 added community home page 2017-06-09 15:04:48 +02:00
Art Lowel
2c7f646b71 fixed relative/absolute paths 2017-06-08 16:59:49 +02:00
Art Lowel
9e1f7848b6 Merge branch 'master' into live-rest-backend 2017-06-08 16:16:50 +02:00
Art Lowel
0677bc38ee switch to live rest-backend, still issue with bitstreams on item page 2017-06-07 18:25:52 +02:00
Àlex Magaz Graça
2e89cb03d8 Fix page loading failing when the collection hasn't a logo 2017-06-07 14:50:02 +02:00
Àlex Magaz Graça
c5d92d4e5f Implement collection home page
Shows the following fields if they exist:
* title
* logo
* introductory text
* news (also referred to as sidebarText)
* copyright text
* license

Fixes https://github.com/DSpace/dspace-angular/issues/63
2017-06-07 10:35:15 +02:00
Art Lowel
a8781de044 Merge branch 'pr/100' into live-rest-backend 2017-06-02 15:14:02 +02:00
Art Lowel
7b0c11355e Merge branch 'rest-embedded' into live-rest-backend 2017-06-02 15:12:24 +02:00
Lotte Hofstede
afb13421d2 41650: fixed full file section 2017-06-02 12:21:49 +02:00
Lotte Hofstede
6c4c23a574 41650: updated links to full/simple view 2017-06-02 12:06:17 +02:00
Lotte Hofstede
2ee2227761 41650: removed console log 2017-06-02 12:06:17 +02:00
Lotte Hofstede
d0fc0e6970 41650: fixed AoT bug, links and tests 2017-06-02 12:06:17 +02:00
Lotte Hofstede
abd7ffc97a removed comment 2017-06-02 12:06:17 +02:00
Lotte Hofstede
e1b3c971c3 removed console log 2017-06-02 12:06:17 +02:00
Lotte Hofstede
fa9cd9b1ea 41650: finished full item page 2017-06-02 12:06:16 +02:00
Lotte Hofstede
563a8ca66b 41650: full item page 2017-06-02 12:04:55 +02:00
Art Lowel
fbb64a6031 adapted remote data build method to aggregate relation remotedata arrays 2017-06-02 12:04:04 +02:00
Art Lowel
2b74c3034a added aggregate function for RemoteData arrays 2017-06-02 11:56:11 +02:00
Lotte Hofstede
145b080854 41650: moved files and made small full item page changes 2017-06-02 11:56:11 +02:00
Art Lowel
57f42549cd Merge pull request #97 from artlowel/add-type-to-mock-data
Add type to mock data
2017-06-01 18:05:17 +02:00
Art Lowel
68cb012306 Merge pull request #96 from LotteHofstede/w2p-40416_simple-item-page
Simple Item Page - Tests & Docs
2017-06-01 18:04:39 +02:00
Art Lowel
739371cb35 added support for embedded resources 2017-06-01 11:41:15 +02:00
Art Lowel
c21a255a62 Merge branch 'master' into rest-embedded 2017-05-30 17:32:00 +02:00
Art Lowel
11c5971b9e added type to mock items 2017-05-30 17:29:06 +02:00
Giuseppe Digilio
7d8d39a0ed Fix peer-dependencies 2017-05-26 19:31:11 +02:00
Giuseppe Digilio
c5c0bb776b Add host-window.service 2017-05-25 17:27:31 +02:00
Art Lowel
f60c0674f6 add the type property to mock data and ensure it is deserialized 2017-05-23 17:51:58 +02:00
Art Lowel
df98e02194 Replaced row class with custom mixin, as using row to offset gutter widths has side-effects in newer versions of bootstrap 2017-05-23 17:48:10 +02:00
Lotte Hofstede
b262e066cf 40416: more tests and docs 2017-05-23 10:49:57 +02:00
Lotte Hofstede
6aff818dcd first tests and docs 2017-05-23 10:21:26 +02:00
Giuseppe Digilio
857fd448d4 fix CI build fail 2017-05-22 12:29:36 +02:00
Giuseppe Digilio
4dc543eda0 Fix for ng2-pagination 2017-05-22 10:38:34 +02:00
Giuseppe Digilio
04f1c1c08d Merge remote-tracking branch 'upstream/master' into pagination 2017-05-19 23:07:42 +02:00
Giuseppe Digilio
92f1d95ddd Merge remote-tracking branch 'upstream/master' into pagination
# Conflicts:
#	package.json
#	src/app/app.component.html
#	src/app/app.component.ts
#	src/app/core/cache/request-cache.reducer.spec.ts
#	src/app/core/cache/request-cache.service.spec.ts
#	src/app/core/core.module.ts
#	src/app/shared/shared.module.ts
2017-05-19 22:03:21 +02:00
Giuseppe Digilio
412a3a3970 Add pagination component 2017-05-19 18:22:41 +02:00
Art Lowel
71c1e3a549 fixing merge conflicts 2017-05-18 17:57:51 +02:00
Art Lowel
4eaa5e8471 Merge pull request #94 from artlowel/upgrade-to-ngx-translate
upgraded to ngx-translate
2017-05-18 17:43:03 +02:00
Art Lowel
230c23bdd0 Merge pull request #93 from artlowel/initial-home-page-content
Initial home page content
2017-05-18 17:42:35 +02:00
Art Lowel
4c16291112 Merge pull request #88 from LotteHofstede/w2p-40416_simple-item-page
Simple Item View Page
2017-05-18 17:42:13 +02:00