Skip to content

Conversation

@rnastyuk
Copy link
Contributor

Fix: added shared bookmarks service

kpetrov24exoft and others added 30 commits May 28, 2025 20:04
# Conflicts:
#	src/app/features/project/addons/addons.component.ts
#	src/app/features/settings/addons/addons.component.spec.ts
#	src/app/features/settings/addons/addons.component.ts
#	src/app/shared/components/addons/addon-card-list/addon-card-list.component.ts
#	src/app/shared/components/addons/addon-card/addon-card.component.ts
# Conflicts:
#	src/app/features/project/addons/addons.component.html
#	src/app/features/project/addons/addons.component.ts
#	src/app/features/settings/addons/addons.component.html
#	src/app/features/settings/addons/addons.component.ts
#	src/app/shared/components/addons/addon-card/addon-card.component.html
#	src/app/shared/components/addons/addon-card/addon-card.component.ts
#	src/app/shared/enums/index.ts
#	src/assets/i18n/en.json
#	src/assets/styles/overrides/button.scss
# Conflicts:
#	src/app/shared/components/addons/addon-card/addon-card.component.ts
#	src/app/shared/services/index.ts
#	src/assets/i18n/en.json
#	src/assets/styles/styles.scss
# Conflicts:
#	src/app/core/components/nav-menu/nav-menu.component.ts
#	src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.html
#	src/app/features/settings/tokens/services/tokens.service.ts
# Conflicts:
#	src/app/features/collections/components/collections-filters/collections-filters.component.html
#	src/app/features/collections/components/collections-main-content/collections-main-content.component.html
#	src/assets/styles/overrides/accordion.scss
#	src/assets/styles/overrides/paginator.scss
# Conflicts:
#	src/app/features/collections/collections.component.html
#	src/app/features/collections/collections.component.scss
#	src/app/features/collections/collections.component.ts
#	src/app/features/collections/collections.routes.ts
#	src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.html
#	src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.ts
#	src/app/features/collections/components/collections-filters/collections-filters.component.html
#	src/app/features/collections/components/collections-filters/collections-filters.component.ts
#	src/app/features/collections/components/collections-main-content/collections-main-content.component.html
#	src/app/features/collections/components/collections-main-content/collections-main-content.component.ts
#	src/app/features/collections/components/collections-search-results/collections-search-results.component.html
#	src/app/features/collections/constants/filter-types.const.ts
#	src/app/features/collections/constants/sort-options.const.ts
#	src/app/features/collections/enums/index.ts
#	src/app/features/collections/models/collections-json-api.models.ts
#	src/app/features/collections/models/index.ts
#	src/app/features/collections/services/collections-query-sync.service.ts
#	src/app/features/collections/services/collections.service.ts
#	src/app/features/collections/store/collections.actions.ts
#	src/app/features/collections/store/collections.state.ts
#	src/app/features/preprints/models/preprints.models.ts
#	src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts
#	src/app/features/preprints/services/index.ts
#	src/assets/i18n/en.json
#	src/assets/styles/styles.scss
# Conflicts:
#	src/app/features/collections/store/collections/collections.state.ts
#	src/app/features/my-projects/my-projects.component.ts
#	src/app/features/my-projects/services/my-projects.service.ts
#	src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts
#	src/app/features/project/overview/project-overview.component.ts
#	src/app/shared/stores/index.ts
rnastyuk added 15 commits July 4, 2025 11:17
# Conflicts:
#	src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts
# Conflicts:
#	src/app/features/my-projects/my-projects.component.ts
#	src/app/shared/stores/index.ts
# Conflicts:
#	src/app/features/collections/components/add-to-collection/add-to-collection.component.scss
#	src/app/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component.html
#	src/app/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component.ts
#	src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.html
#	src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.html
#	src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts
#	src/app/features/collections/components/collections-discover/collections-discover.component.scss
#	src/app/features/collections/services/add-to-collection.service.ts
#	src/app/shared/mappers/projects/projects.mapper.ts
#	src/app/shared/services/projects.service.ts
#	src/app/shared/stores/projects/projects.state.ts
#	src/assets/styles/components/collections.scss
@rnastyuk rnastyuk requested a review from nsemets July 14, 2025 12:16
@rnastyuk rnastyuk merged commit a36d2cf into main Jul 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants