Commit Graph

35 Commits

Author SHA1 Message Date
Antoine Snyers
d571c174f0 Use Angulartics' Routerless module
https://github.com/DSpace/dspace-angular/issues/560
2020-02-14 13:03:06 +01:00
Giuseppe Digilio
daeb475eb6 upgrade angulartics lib version 2020-01-02 10:47:27 +01:00
Antoine Snyers
dfa846a98e Track page views and searches in DSpace with a custom Angulartics2 provider 2019-11-28 09:54:39 +01:00
Tim Donohue
d85cc0a0f2 Merge pull request #467 from mspalti/login_redirect_url
Redirecting user to same page after login.
2019-09-19 17:30:00 +02:00
Art Lowel
b186ec635e Merge branch 'master' into improve-i18n-files 2019-09-12 17:13:43 +02:00
Michael W Spalti
d9fb68dce9 Modified redirectToPreviousUrl to use the standalone page parameter if no redirect url is found in the store.
Removed unused import that was causing merge conflict.

Once again try to fix merge conflict.

Added routeService to server module providers.

Changed order of providers.

Minor change to ServerAuthService to make method signature consistent with AuthService.

Try adding RouteService to browser-app module to see if that fixes travis build.

One more try at getting the CI build to work.

Removed change to browser module.
2019-09-09 12:58:55 -07:00
lotte
62880336d9 Merge branch 'master' into w2p-62355_optimize-search-performance 2019-08-14 12:31:07 +02:00
Art Lowel
359cb10fa3 add json5 support 2019-07-26 17:21:57 +02:00
lotte
bb76015aa1 Solved issue with non-existing search pages 2019-06-18 08:58:35 +02:00
lotte
b2ceb8e9d6 61949: finished refactoring, adding type doc 2019-04-29 16:21:36 +02:00
Giuseppe Digilio
ff97a4cc8b Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
#	package.json
#	src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/app.module.ts
#	src/app/core/auth/auth.interceptor.ts
#	src/app/core/cache/response-cache.service.spec.ts
#	src/app/core/data/browse-response-parsing.service.spec.ts
#	src/app/core/data/data.service.spec.ts
#	src/app/core/data/request.service.spec.ts
#	src/app/core/data/request.service.ts
#	src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
#	src/app/core/integration/integration.service.ts
#	src/app/core/metadata/metadata.service.spec.ts
#	src/app/core/registry/registry.service.spec.ts
#	src/app/core/shared/collection.model.ts
#	src/app/core/shared/item.model.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.ts
#	src/app/shared/form/builder/form-builder.service.spec.ts
#	src/app/shared/form/form.service.spec.ts
#	src/app/shared/notifications/notification/notification.component.spec.ts
#	src/app/shared/services/route.service.spec.ts
#	src/app/shared/services/route.service.ts
#	src/app/shared/shared.module.ts
#	yarn.lock
2018-12-13 20:28:11 +01:00
lotte
3a8f7754fa 55143: fixed all tests 2018-10-11 12:02:40 +02:00
lotte
14fd58dd21 issues with form component tests 2018-09-07 13:48:00 +02:00
lotte
777facf5cd intermediate commit 2018-08-29 15:12:01 +02:00
lotte
2cbe6a6d91 upgrade to angular6 2018-08-24 13:26:43 +02:00
Giuseppe
6f60cd68e2 Merged submission module code 2018-07-26 18:36:36 +02:00
Giuseppe Digilio
3126a96554 Added x-forwarded-for header to pass server ip check 2018-06-28 11:51:52 +02:00
Giuseppe Digilio
f8b3cc516c Merge remote-tracking branch 'remotes/origin/master' into authentication
# Conflicts:
#	src/app/+search-page/search-filters/search-filter/search-filter.component.ts
#	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/+search-page/search-service/search.service.ts
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/core/cache/response-cache.models.ts
#	src/app/core/core.effects.ts
#	src/app/core/core.module.ts
#	src/app/core/shared/hal-endpoint.service.ts
#	src/app/shared/services/route.service.ts
#	src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
#	src/modules/app/browser-app.module.ts
#	src/modules/app/server-app.module.ts
2018-05-08 10:57:15 +02:00
Giuseppe Digilio
c8a1fe0860 Removed use of platform service and created different service for SSR and CSR 2018-05-03 19:08:07 +02:00
Kristof De Langhe
062f0f1a0e 50479: compile errors fixed 2018-03-23 10:12:20 +01:00
Kristof De Langhe
9454b9393b 50479: angularticsMock + tslint fixes 2018-03-20 15:54:11 +01:00
Kristof De Langhe
35cbedf6fe 50479: Added google analytics support 2018-03-20 15:29:05 +01:00
Giuseppe Digilio
b7cff01dab fixed auth module 2018-02-10 13:01:58 +01:00
Art Lowel
4fbceab1b9 Switched to angular 5's built-in transfer state api 2018-02-01 13:17:59 +01:00
Art Lowel
1aebb4fb5b package @angularclass/idle-preload was renamed to angular-idle-preload 2018-01-23 16:32:26 +01:00
Art Lowel
5655194dc4 disabled router tracing 2017-10-27 18:18:26 +02:00
Art Lowel
ce330fcb47 refactored template variables 2017-10-27 17:57:28 +02:00
Art Lowel
ee84399d23 fixed an issue where a rehydrate would sometimes leave the app in a broken state 2017-10-26 12:58:42 +02:00
Art Lowel
ad631f8031 Merge branch 'master' into improve-support-for-hal-links 2017-10-12 13:14:43 +02:00
William Welling
8c4c533203 include all modules in coverage 2017-10-09 08:18:28 -05:00
William Welling
5b0dbfbc37 removed unused modules 2017-09-29 20:44:11 -05:00
William Welling
7cbd79fa85 fixed aot build with translate loader (wip) 2017-09-26 12:25:17 -05:00
Art Lowel
b66a70b526 fixed rehydrate issue 2017-09-07 13:06:58 +02: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