Commit Graph

9215 Commits

Author SHA1 Message Date
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
Art Lowel
dd16dedd1d Merge pull request #95 from 4Science/pagination
This merge closes #46
2017-05-29 10:11:19 +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
0875f76962 Removed useless e2e tests 2017-05-23 16:03:34 +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
0e4544fa0d fix missing package 2017-05-22 09:42:14 +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
Art Lowel
8f666dde63 Merge pull request #92 from artlowel/rest-communities
Add support for Communities
2017-05-18 17:41:49 +02:00
Art Lowel
cdb5f01198 upgraded to ngx-translate 2017-05-18 16:49:33 +02:00
Art Lowel
a721bb0a4b adjusted e2e test to match new contents 2017-05-18 15:26:16 +02:00
Art Lowel
f5e5b72f47 added initial home page content 2017-05-18 15:02:33 +02:00
Art Lowel
e5a885afe7 Add support for Communities 2017-05-12 12:50:23 +02:00
Art Lowel
6359bbc645 Merge pull request #87 from artlowel/rest-relationships
Rest relationships
2017-05-11 17:22:31 +02:00
Lotte Hofstede
0f472fb06b 40416: removed thumbnails and applied test fix 2017-05-10 13:30:18 +02:00
Lotte Hofstede
8267f877b2 Merge branch 'rest-relationships' of https://github.com/artlowel/dspace-angular into w2p-40416_simple-item-page 2017-05-10 13:23:06 +02:00
Lotte Hofstede
9906dd59e3 40416: Thumbnail fix + clean up 2017-05-10 13:03:53 +02:00
Art Lowel
45d174ccc3 Forgot to revert test after reverting the ObjectCacheService 2017-05-10 13:01:46 +02:00
Lotte Hofstede
6652f61770 40416: clean up 2017-05-08 10:25:35 +02:00
Lotte Hofstede
176c498770 40416: solved collections issue on item page 2017-05-08 10:20:59 +02:00
Lotte Hofstede
57aa58ac56 Merge branch 'rest-relationships' into w2p-40416_simple-item-page
Conflicts:
	src/app/core/cache/models/normalized-item.model.ts
	src/app/core/shared/item.model.ts
2017-05-08 09:26:49 +02:00
Art Lowel
609f617e52 Forgot to add files 2017-05-05 15:41:06 +02:00
Art Lowel
f56eefab59 Fixed an issue where deadlocks could occur when loading the relationship decorators 2017-05-05 15:37:43 +02:00
Lotte Hofstede
54cd529cc6 40416: normalized collection bug 2017-05-05 10:21:33 +02:00
Art Lowel
b9de162e00 another attempt at fixing reflect-metadata issue 2017-05-04 15:47:47 +02:00
Art Lowel
1b1b742717 moved reflect-metadata from devDependencies to dependencies in order to try and fix a travis build issue 2017-05-04 15:14:37 +02:00
Art Lowel
36924b5fb9 updated test 2017-05-04 14:17:27 +02:00
Lotte Hofstede
25ef735366 Merge branch 'rest-relationships' into w2p-40416_simple-item-page
Conflicts:
	src/app/core/cache/models/bundle-builder.ts
	src/app/core/cache/models/collection-builder.ts
	src/app/core/cache/models/item-builder.ts
2017-05-04 13:47:56 +02:00
Art Lowel
d3f478ef0f refactoring 2017-05-04 13:44:14 +02:00
Lotte Hofstede
86901fae2e 40416: Start of file section 2017-05-04 13:44:03 +02:00
Lotte Hofstede
d932b44a77 40416: small fixes and thumbnails 2017-05-03 14:28:26 +02:00
Art Lowel
2a2bb36692 refactoring 2017-05-03 11:05:18 +02:00
Tim Donohue
5894498a3c Fix a broken link 2017-04-27 08:31:44 -05:00
Lotte Hofstede
b6fd84eb38 Merge remote-tracking branch 'artlowel/rest-relationships' into w2p-40416_simple-item-page
Conflicts:
	src/app/core/shared/dspace-object.model.ts
2017-04-27 13:12:23 +02:00
Art Lowel
f8d6e96e44 added builders for bundles and bitstreams 2017-04-24 13:43:54 +02:00