Art Lowel
|
32e7b7a3b4
|
fix merge mistakes
|
2019-05-30 10:12:37 +02:00 |
|
Art Lowel
|
eca6aa9b04
|
refactor webpack config
|
2019-05-30 10:06:06 +02:00 |
|
Art Lowel
|
b352137fb3
|
add i18n labels for person facets
|
2019-05-29 18:05:30 +02:00 |
|
Kristof De Langhe
|
7d75454623
|
Merge branch 'travis-without-global-script' into w2p-62339_Relationships-link-to-item-via-HAL-links
|
2019-05-29 14:50:25 +02:00 |
|
lotte
|
813a856ed8
|
removed default value for search configuration
|
2019-05-29 13:48:50 +02:00 |
|
lotte
|
b846384ba7
|
Added typedoc and remove unnecessary import statements
|
2019-05-29 13:10:42 +02:00 |
|
Kristof De Langhe
|
4143824bb8
|
Merge branch 'master' into w2p-62339_Relationships-link-to-item-via-HAL-links
Conflicts:
src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts
src/app/+item-page/simple/item-types/shared/item.component.ts
|
2019-05-29 10:27:19 +02:00 |
|
lotte
|
f763dcf752
|
Merge branch 'travis-without-global-script' into Fixed-filtered-search-page
|
2019-05-29 10:01:40 +02:00 |
|
lotte
|
b5c98e6917
|
Removed call to global script from travis setup
|
2019-05-29 10:00:08 +02:00 |
|
lotte
|
49dc4b86e2
|
Fixed issue with switch component on mydspace page
|
2019-05-29 09:24:33 +02:00 |
|
Art Lowel
|
da4115f122
|
fix issues following rebase
|
2019-05-28 16:21:02 +02:00 |
|
lotte
|
898795fba1
|
Solved issue where edit metadata page broke
|
2019-05-28 14:58:35 +02:00 |
|
lotte
|
81ba49f220
|
Simplified and refactored manual creation of remote data objects for tests
|
2019-05-28 14:58:10 +02:00 |
|
Art Lowel
|
11d06e34b1
|
moved themes to separate folder
|
2019-05-28 14:20:21 +02:00 |
|
lotte
|
cfcf496cc1
|
fixed tests
|
2019-05-28 14:18:56 +02:00 |
|
lotte
|
8a32777802
|
finished webpack config for switching themes
|
2019-05-28 14:18:56 +02:00 |
|
lotte
|
22928c3f23
|
intermediate theming commit
|
2019-05-28 13:53:12 +02:00 |
|
lotte
|
4a37759dea
|
61872: switching themes using wpack string replacer
|
2019-05-28 13:52:45 +02:00 |
|
lotte
|
3a7929369a
|
working on extracting CSS in a separate file
|
2019-05-28 13:52:15 +02:00 |
|
lotte
|
139edd2df1
|
renamed theme to Mantis
|
2019-05-28 13:51:56 +02:00 |
|
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 |
|