Commit 702d618
committed
Merge branch 'main' into fix/search-updates
# Conflicts:
# src/app/features/institutions/institutions.routes.ts
# src/app/features/my-profile/components/my-profile-filter-chips/my-profile-filter-chips.component.scss
# src/app/features/my-profile/components/my-profile-search/my-profile-search.component.scss
# src/app/features/preprints/components/filters/preprints-filter-chips/preprints-filter-chips.component.scss
# src/app/features/preprints/components/filters/preprints-resources-filters/preprints-resources-filters.component.scss
# src/app/features/preprints/components/filters/preprints-resources/preprints-resources.component.scss
# src/app/features/search/components/filter-chips/filter-chips.component.scss
# src/app/features/search/components/resource-filters/resource-filters.component.scss
# src/app/features/search/components/resources/resources.component.scss
# src/app/shared/constants/index.ts
# src/app/shared/models/index.ts
# src/app/shared/models/user/user.models.ts
# src/app/shared/models/view-only-links/view-only-link-response.model.ts
# src/app/shared/stores/index.ts424 files changed
Lines changed: 3890 additions & 7323 deletions
File tree
- src
- app
- core
- components
- breadcrumb
- forbidden-page
- header
- page-not-found
- request-access
- root
- constants
- guards
- store/user
- features
- admin-institutions/pages/institutions-summary
- analytics
- components
- analytics-kpi
- view-duplicates
- constants
- enums
- mappers
- models
- services
- store
- auth/pages
- forgot-password
- reset-password
- collections/components
- add-to-collection
- collections-discover
- collections-filters
- collections-help-dialog
- collections-main-content
- collections-search-result-card
- files
- components
- edit-file-metadata-dialog
- move-file-dialog
- pages
- file-detail
- files
- institutions
- pages/institutions-list
- metadata
- components
- cedar-template-form
- metadata-affiliated-institutions
- metadata-contributors
- metadata-description
- metadata-doi
- metadata-funding
- metadata-license
- metadata-publication-doi
- metadata-resource-information
- metadata-subjects
- constants
- dialogs
- affiliated-institutions-dialog
- contributors-dialog
- description-dialog
- funding-dialog
- license-dialog
- publication-doi-dialog
- resource-information-dialog
- resource-tooltip-info
- helpers
- mappers
- models
- pages
- add-metadata
- services
- store
- moderation/components/add-moderator-dialog
- my-projects
- preprints
- components
- preprint-provider-hero
- preprint-services
- preprints-help-dialog
- stepper
- author-assertion-step
- file-step
- metadata-step
- contributors
- review-step
- supplements-step
- title-and-abstract-step
- pages/select-preprint-service
- project
- addons
- components
- configure-addon
- connect-configured-addon
- contributors
- components/create-view-link-dialog
- models
- metadata
- mappers
- models
- services
- store
- overview
- components
- overview-components
- overview-wiki
- recent-activity
- toggle-publicity-dialog
- models
- registrations
- settings
- registries
- components
- metadata
- contributors
- registries-license
- registry-services
- pages/registries-landing
- registry
- components
- registry-revisions
- registry-statuses
- mappers
- models
- pages
- registry-metadata-add
- registry-metadata
- registry-overview
- registry-resources
- services
- store/registry-metadata
- settings
- addons
- components/connect-addon
- developer-apps
- pages/developer-apps-list
- notifications
- profile-settings
- tokens
- pages
- token-details
- tokens-list
- static
- privacy-policy
- terms-of-use
- assets
- i18n-cav
- i18n
- styles
- components
- overrides
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
30 | 31 | | |
31 | 32 | | |
32 | 33 | | |
| |||
43 | 44 | | |
44 | 45 | | |
45 | 46 | | |
46 | | - | |
| 47 | + | |
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
| 85 | + | |
85 | 86 | | |
86 | 87 | | |
87 | 88 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
81 | | - | |
82 | 81 | | |
83 | | - | |
84 | | - | |
85 | 82 | | |
86 | 83 | | |
87 | 84 | | |
| |||
101 | 98 | | |
102 | 99 | | |
103 | 100 | | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | 101 | | |
108 | 102 | | |
109 | 103 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| 49 | + | |
49 | 50 | | |
50 | 51 | | |
51 | 52 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
| |||
165 | 166 | | |
166 | 167 | | |
167 | 168 | | |
168 | | - | |
169 | | - | |
170 | | - | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
171 | 172 | | |
172 | 173 | | |
173 | 174 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
0 commit comments