Commit Graph

56 Commits

Author SHA1 Message Date
Giuseppe Digilio
eda0ebb21c Merge remote-tracking branch 'origin/master' into submission
# Conflicts:
#	resources/i18n/en.json
#	src/app/app.component.scss
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/app.module.ts
#	src/app/shared/chips/chips.component.spec.ts
#	src/app/shared/chips/models/chips-item.model.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.html
#	src/app/shared/shared.module.ts
#	yarn.lock
2018-12-20 17:02:46 +01: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
07c9927b6a finished dynamic menus 2018-12-06 15:50:12 +01:00
lotte
c17b395ba0 57053: intermediate commit active issue 2018-12-05 12:46:22 +01:00
lotte
567d4dc331 sidebar animations 2018-11-23 14:44:11 +01:00
lotte
17239cd1be Merge branch 'resolvers-branch-angular6' into w2p-57053_menu-angular6
Conflicts:
	src/app/app.module.ts
	src/app/header/header.component.ts
	src/app/navbar/navbar.effects.ts
2018-11-12 09:49:26 +01:00
lotte
83bf3ab8b8 start of vertical menu 2018-11-09 17:00:58 +01:00
lotte
b0fe14d015 57053: horizontal menu 2018-11-09 10:18:17 +01:00
lotte
2af1d3b042 57053: started on menu 2018-11-05 16:34:03 +01:00
Art Lowel
335d74ea7e fix AoT issues with store devtools 2018-10-22 13:18:24 +02:00
Art Lowel
7ada6c7b21 configure @ngrx/store-devtools 2018-10-22 11:35:22 +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
478cbaf57c Merge remote-tracking branch 'remotes/origin/master' into authentication
# Conflicts:
#	src/app/app.effects.ts
#	src/app/app.module.ts
#	src/app/app.reducer.ts
#	src/app/core/core.module.ts
#	src/app/shared/shared.module.ts
2018-05-15 17:01:26 +02:00
Giuseppe Digilio
bafa46bb24 Adjusted CSS and added default notification options in the environment config files 2018-05-07 15:49:03 +02:00
Andrea Chiapparelli - 4Science
8c555292ac notification start 2018-03-02 16:19:15 +01:00
Giuseppe Digilio
e9acec0633 Merge remote-tracking branch 'remotes/origin/master' into authentication 2018-02-09 09:56:50 +01:00
Giuseppe Digilio
2309c1be3b Added login page ang nav menu 2018-02-01 17:13:08 +01:00
Art Lowel
4fbceab1b9 Switched to angular 5's built-in transfer state api 2018-02-01 13:17:59 +01:00
courtneypattison
7a7d27c680 Replaced Http with HttpClient 2017-12-19 13:50:12 -08:00
Art Lowel
07cdf650f8 Merge pull request #204 from courtneypattison/re-export-routermodule
re-export RouterModule in AppRoutingModule
2017-11-23 10:32:24 +01:00
courtneypattison
b257ca7033 re-export RouterModule in AppRoutingModule 2017-11-22 12:23:11 -08:00
Lotte Hofstede
569d7a634b 45621: filters facet route service 2017-11-09 15:02:36 +01:00
Art Lowel
ad631f8031 Merge branch 'master' into improve-support-for-hal-links 2017-10-12 13:14:43 +02:00
Art Lowel
1cbc63d77c Fixed an issue where the debugMetareducers wouldn't be active even though debug was enabled in the config 2017-10-11 16:06:54 +02:00
William Welling
7937a47aa5 added error component and coverage for new components 2017-10-04 14:17:19 -05:00
William Welling
5b0dbfbc37 removed unused modules 2017-09-29 20:44:11 -05:00
William Welling
e74e9ac733 conditionally enable debug meta reducers based on debug configuration 2017-09-27 06:24:13 -05:00
William Welling
c952dc0f13 conditionally include development modules 2017-09-26 20:48:24 -05:00
William Welling
68d8ea00d2 functional base href from ui config namespace property 2017-09-26 20:11:56 -05:00
William Welling
35580b7c48 use dependency injection for meta reducers 2017-09-26 18:17:22 -05:00
William Welling
3e76752652 some minor cleanup 2017-09-26 14:39:27 -05:00
William Welling
3d02e660da fixed core and shared module usage, lazy loading modules 2017-09-26 11:44:07 -05:00
Art Lowel
30ee3859c8 fixed issues with ngrx platform upgrade: selectors, tests and router state in the dev tools 2017-09-06 16:55:36 +02:00
Art Lowel
05626e2607 no more build errors, still issues with the selectors not returning anything 2017-09-06 16:51:34 +02:00
William Welling
066bba28af fixed lint errors 2017-07-13 11:19:02 -05:00
William Welling
c08f5c672b dependency upgrades, server and platform module updates, linting wip 2017-07-12 14:33:16 -05:00
Christian Scheible
3ad3df7568 Refactored community and collection pages to use a shared component for most of the content. This PR connect’s to #89 2017-06-13 10:02:49 +02:00
Àlex Magaz Graça
c5d92d4e5f Implement collection home page
Shows the following fields if they exist:
* title
* logo
* introductory text
* news (also referred to as sidebarText)
* copyright text
* license

Fixes https://github.com/DSpace/dspace-angular/issues/63
2017-06-07 10:35:15 +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
Lotte Hofstede
66e421a1eb 40416: started on simple item view page 2017-03-28 17:17:24 +02:00
Art Lowel
7745938027 More refactoring + reusing the server's store on the client 2017-03-02 13:36:40 +01:00
Art Lowel
20aec34c68 Merge branch 'master' into hal-serializer 2017-02-16 14:29:22 +01:00
Art Lowel
adc79e957f added hal serializer 2017-02-14 09:51:13 +01:00
Giuseppe Digilio
f86869a70e app.module.ts changed 2017-02-13 16:15:23 +01:00
Giuseppe Digilio
15f8892dd5 Footer component 2017-02-13 16:00:07 +01:00
Lotte Hofstede
82a379df3c 38248: Added PageNotFound component 2017-01-12 15:18:15 +01:00
Art Lowel
d3370e266a fixed an issue where the reducers wouldn't be combined correctly when using AoT compilation 2016-12-13 12:03:04 +01:00
Art Lowel
2846dc9446 header, isNavBarCollapsed observable: filter out undefined state that can occur when using AoT compilation 2016-12-13 10:14:47 +01:00