Commit Graph

2231 Commits

Author SHA1 Message Date
lotte
1d99d8a535 61299: solved merge conflicts 2019-05-28 13:50:53 +02:00
lotte
a8aea654a1 cleaned up theming code 2019-05-28 13:50:29 +02:00
lotte
c0f3d38695 added banner and changed fonts 2019-05-28 13:47:43 +02:00
lotte
2cc3dd0694 added custom theming 2019-05-28 13:46:51 +02:00
lotte
856211d964 finished SCSS theming support 2019-05-28 13:44:00 +02:00
lotte
a4a4be9983 added different themes, issue with ngrx 2019-05-28 13:42:20 +02:00
lotte
35f73708ef fixed issues after merging 2019-05-27 15:09:51 +02:00
lotte
a0a0830e5f 61949: merged master, resolving conflicts 2019-05-24 16:57:38 +02:00
lotte
233909d6ca Merge branch 'master' into w2p-61949_object-factory-refactoring
Conflicts:
	src/app/core/cache/models/normalized-object-factory.ts
	src/app/core/cache/response.models.ts
	src/app/core/core.module.ts
	src/app/core/data/base-response-parsing.service.ts
	src/app/core/shared/resource-type.ts
	src/app/core/submission/submission-response-parsing.service.ts
2019-05-24 15:42:24 +02:00
Kristof De Langhe
fca9b4d481 Merge branch 'master' into w2p-62063_Configurable-Browse-By 2019-05-24 14:13:24 +02:00
Kristof De Langhe
1fb6b45560 62063: 62063: Small Issue fixes 2019-05-24 14:12:43 +02:00
lotte
24fdbaf0bd 62530: fixed loading issue 2019-05-23 16:15:40 +02:00
lotte
c3bd151cc3 Fixed issue with retrieving request 2019-05-22 16:55:49 +02:00
lotte
8a5bffa881 62530: working on fixing preboot issue with fixed filters/route params 2019-05-21 17:02:36 +02:00
Kristof De Langhe
796afb3919 Merge branch 'master' into w2p-61142_Relations-add-edit-delete-and-permissions
Conflicts:
	src/app/core/cache/object-cache.service.ts
	src/app/core/core.module.ts
	src/app/core/data/request.service.ts
	src/app/core/shared/item.model.ts
2019-05-20 13:08:33 +02:00
Kristof De Langhe
b8822e996d 62264: Fix module export 2019-05-20 10:50:49 +02:00
Kristof De Langhe
e9bfb77300 Merge branch 'master' into w2p-62264_Group-logical-entity-types-together 2019-05-20 10:09:20 +02:00
Tim Donohue
2d07cc1913 Reset URL to use DSpace 7 REST API Demo site. 2019-05-17 13:37:57 -05:00
Tim Donohue
6ba7fb34fa Reset URL to use DSpace 7 REST API Demo site. dspace-7.0-preview-1 2019-05-17 13:36:46 -05:00
Tim Donohue
24907a7405 Merge pull request #399 from atmire/preview-misc-fixes-2-themed
[Preview theme] Miscellaneous fixes for Preview Release - Part 2
2019-05-17 12:32:11 -05:00
Art Lowel
cb28c4fc0c fix getIDHref mock, it returns a string, not an observable 2019-05-17 17:49:48 +02:00
Tim Donohue
31c9694666 Merge pull request #398 from atmire/preview-misc-fixes-2
Miscellaneous fixes for Preview Release - Part 2
2019-05-17 10:07:50 -05:00
lotte
9ac0aaeb28 removed lint issues 2019-05-17 17:00:22 +02:00
lotte
8d379870ca fixed submission collection list 2019-05-17 16:58:26 +02:00
Art Lowel
69331ae2db Merge branch 'preview-misc-fixes-2' into preview-misc-fixes-2-themed 2019-05-17 14:36:50 +02:00
Art Lowel
081c5d0952 fix lint error 2019-05-17 14:36:22 +02:00
Art Lowel
1306f1a6a1 Merge branch 'preview-misc-fixes-2' of https://git.atmire.com/contributions/dspace-angular into preview-misc-fixes-2 2019-05-17 13:28:18 +02:00
Art Lowel
151ac0114f replace npm variable with dedicated script to run webpack with a larger heapspace. The variables didn't work cross-platform 2019-05-17 13:28:10 +02:00
lotte
8aaff69d97 fixed issue with thumbnails not showing 2019-05-17 11:43:54 +02:00
Art Lowel
d16335ddb1 update requirement versions in docs 2019-05-17 10:21:37 +02:00
lotte
9b03c02f29 disabled statistics link 2019-05-17 09:44:12 +02:00
Art Lowel
3da7786474 Merge branch 'preview-misc-fixes-2' into preview-misc-fixes-2-themed 2019-05-16 17:27:30 +02:00
lotte
0bdb0ba2b7 fixed test and search facet issue for mydspace 2019-05-16 17:11:13 +02:00
lotte
cbde7fc679 facet fix 2019-05-16 16:44:38 +02:00
lotte
4d5879ec85 added missing inplacesearch input 2019-05-16 15:23:50 +02:00
Art Lowel
c0dbafeb5c Merge branch 'preview-misc-fixes-2' into entities-demo-server 2019-05-16 14:57:31 +02:00
lotte
487ee9f756 small fixes for search 2019-05-16 13:43:07 +02:00
Art Lowel
5254308b8b fix reference webpack:watch to script 2019-05-16 11:38:10 +02:00
Art Lowel
fa5c80b7e1 double the webpack heap space 2019-05-16 11:16:24 +02:00
lotte
3afa288c58 fixed loading issue 2019-05-16 10:20:35 +02:00
Art Lowel
2852ef0364 fix test issues, rewrite recent submissions using switchmap 2019-05-16 09:33:55 +02:00
lotte
c216e35a23 added search link fixes 2019-05-15 15:34:46 +02:00
Art Lowel
f34c19717d fix an issue where the state of an aggregated RD would be wrong when some of the RDs it's based on were still pending 2019-05-15 10:51:36 +02:00
Tim Donohue
eef3112883 Merge branch 'master' into preview 2019-05-14 16:46:55 -05:00
Tim Donohue
1b66d18227 Merge pull request #397 from atmire/recent-submissions-issue
[DS-4236] fix issues with collection recent submissions
2019-05-14 16:42:31 -05:00
Art Lowel
e31c3c861e fix an issue where the recent submissions on collection homepages would be wrong, and would continually rerender 2019-05-14 18:37:10 +02:00
Tim Donohue
606c90a901 Remove the word "Release" to avoid line wrapping 2019-05-14 09:37:38 -05:00
Tim Donohue
9c59a9f13e Merge pull request #389 from atmire/Theme-for-item-pages
Preview release theme, extended for Configurable Entities
2019-05-14 09:19:00 -05:00
Tim Donohue
0affb6fd78 Merge pull request #392 from atmire/Miscellaneous-fixes
Miscellaneous fixes
2019-05-14 08:48:18 -05:00
lotte
df83ad9d49 changed home page background darker 2019-05-14 13:23:18 +02:00