Giuseppe Digilio
|
c1db19ee03
|
Merge remote-tracking branch 'remotes/origin/master' into shibboleth
# Conflicts:
# src/app/shared/shared.module.ts
|
2020-02-07 15:04:12 +01:00 |
|
Kristof De Langhe
|
2d3dfde6bb
|
Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2
Conflicts:
config/environment.default.js
resources/i18n/en.json
src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
src/config/global-config.interface.ts
|
2019-08-20 12:43:16 +02:00 |
|
Julius Gruber
|
70d95b4764
|
Changed auth-interceptor: location used to makeAuthStatusObject()
|
2019-08-02 10:39:57 +02:00 |
|
Kristof De Langhe
|
615a47fe5b
|
63669: Content-Source integrated with FieldUpdate
|
2019-07-12 13:34:40 +02:00 |
|
lotte
|
5fa8fd2688
|
added different themes, issue with ngrx
|
2019-05-14 11:38:34 +02:00 |
|
Giuseppe Digilio
|
2009ee566c
|
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
# src/app/core/data/browse-items-response-parsing-service.ts
# src/app/shared/shared.module.ts
|
2019-03-08 16:30:39 +01:00 |
|
Giuseppe Digilio
|
ab42f4b190
|
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
# src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts
# src/app/core/cache/builders/remote-data-build.service.ts
# src/app/core/core.effects.ts
# src/app/core/core.reducers.ts
# src/app/core/data/comcol-data.service.spec.ts
# src/app/core/data/data.service.spec.ts
# src/app/core/data/data.service.ts
# src/app/core/shared/dspace-object.model.ts
# src/app/shared/shared.module.ts
# src/styles/_custom_variables.scss
|
2019-03-08 09:52:47 +01:00 |
|
Kristof De Langhe
|
d5fe5c432b
|
Merge branch 'master' into Browse-By-Date
Conflicts:
config/environment.default.js
src/config/global-config.interface.ts
|
2019-03-04 11:15:49 +01:00 |
|
lotte
|
27180c5960
|
Applied feedback
|
2019-03-01 09:31:03 +01:00 |
|
Kristof De Langhe
|
cdcacedfae
|
59695: Starts-with implementation for browse-by date
|
2019-02-12 10:40:47 +01:00 |
|
Giuseppe Digilio
|
a33f2c2136
|
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
# src/app/shared/shared.module.ts
|
2019-01-25 10:00:52 +01:00 |
|
Bram Luyten
|
17be7a34e0
|
Issue 298 Language switch
|
2019-01-16 20:01:14 +01:00 |
|
Giuseppe
|
6f60cd68e2
|
Merged submission module code
|
2018-07-26 18:36:36 +02:00 |
|
Giuseppe Digilio
|
4d89674cda
|
Fixed server side form validation
|
2018-07-09 19:02:09 +02:00 |
|
Giuseppe Digilio
|
ada577c2be
|
Merge remote-tracking branch 'remotes/origin/master' into notifications
# Conflicts:
# src/app/app.component.ts
# src/app/core/core.module.ts
|
2018-05-07 16:10:17 +02:00 |
|
Kristof De Langhe
|
35cbedf6fe
|
50479: Added google analytics support
|
2018-03-20 15:29:05 +01:00 |
|
Andrea Chiapparelli - 4Science
|
ac350bd813
|
aot fix
|
2018-03-08 13:52:00 +01:00 |
|
Art Lowel
|
78574df60b
|
removed the concept of prerender strategies. rehydrate is the default now
|
2018-02-01 13:57:24 +01:00 |
|
William Welling
|
26e2da93fb
|
recursive merge of config
|
2017-09-26 19:13:32 -05:00 |
|
William Welling
|
1c2818002f
|
added CSR fallback and optionally disable SSR
|
2017-07-19 12:11:15 -05:00 |
|
William Welling
|
c08f5c672b
|
dependency upgrades, server and platform module updates, linting wip
|
2017-07-12 14:33:16 -05:00 |
|