Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(Aplose): Rename "tag" to "label" [ADEV-63] #203

Merged
merged 141 commits into from
Jun 24, 2024

Conversation

ElodieENSTA
Copy link
Member

@ElodieENSTA ElodieENSTA commented Apr 3, 2024

To merge after #202
(All commits regarding this fix starts with the [ADEV-X] id)

Renamed "Annotation set" to "Label set"
Renamed "Tag" to "Label"

rvovard and others added 30 commits February 1, 2024 11:36
…ecated create-react-app (create / move / delete files)
Redirect login already logged
@ElodieENSTA ElodieENSTA force-pushed the feature/ADEV-63-Rename-tag-to-label branch from 6d81966 to 0f19ac6 Compare May 13, 2024 07:31
…ame-tag-to-label

# Conflicts:
#	backend/api/admin/__init__.py
#	backend/api/admin/annotation/result.py
#	backend/api/management/commands/seed.py
#	backend/api/models/__init__.py
#	backend/api/models/annotation/result.py
#	backend/api/models/annotations.py
#	backend/api/serializers/annotation/campaign/create.py
#	backend/api/serializers/annotation_campaign.py
#	backend/api/serializers/annotation_set.py
#	backend/api/serializers/annotation_task.py
#	backend/api/urls.py
#	backend/api/views/annotation_campaign.py
#	backend/tests/fixtures/annotation_results_sessions.yaml
#	backend/tests/fixtures/label_sets.yaml
#	backend/tests/serializers/annotation_campaign.py
#	backend/tests/serializers/annotation_task.py
#	backend/tests/views/annotation_campaign.py
#	frontend/cypress/e2e/0-APLOSE/1 - login.cy.js
#	frontend/cypress/e2e/0-APLOSE/4 - campaign creation.cy.js
#	frontend/cypress/e2e/0-APLOSE/5 - whole file campaign information.cy.js
#	frontend/cypress/globals/campaign.ts
#	frontend/package.json
#	frontend/src/App.tsx
#	frontend/src/components/form/inputs/select.tsx
#	frontend/src/components/form/searchbar/searchbar.component.tsx
#	frontend/src/css/annotator.css
#	frontend/src/css/ionic-override.css
#	frontend/src/fonts/Exo_2/OFL.txt
#	frontend/src/services/api/annotation-campaign-api.service.tsx
#	frontend/src/services/api/user.ts
#	frontend/src/services/create-campaign/import-annotations.ts
#	frontend/src/services/create-campaign/index.ts
#	frontend/src/slices/annotator/annotations.ts
#	frontend/src/slices/create-campaign/index.ts
#	frontend/src/types/annotations.ts
#	frontend/src/view/annotation-campaign-detail.page.tsx
#	frontend/src/view/annotation-campaign-list.page.tsx
#	frontend/src/view/audio-annotator/audio-annotator.page.tsx
#	frontend/src/view/audio-annotator/components/bloc/annotation-list.component.tsx
#	frontend/src/view/audio-annotator/components/bloc/confidence-indicator-bloc.component.tsx
#	frontend/src/view/audio-annotator/components/bloc/current-annotation-bloc.component.tsx
#	frontend/src/view/audio-annotator/components/bloc/presence-bloc.component.tsx
#	frontend/src/view/audio-annotator/components/bloc/tag-list-bloc.component.tsx
#	frontend/src/view/audio-annotator/components/region.component.tsx
#	frontend/src/view/audio-annotator/components/spectro-render.component.tsx
#	frontend/src/view/audio-annotator/components/workbench.component.tsx
#	frontend/src/view/create-campaign/blocs/annotations.bloc.tsx
#	frontend/src/view/create-campaign/blocs/annotators.bloc.tsx
#	frontend/src/view/create-campaign/blocs/import-modal/detectors-config-content.tsx
#	frontend/src/view/create-campaign/create-campaign.page.tsx
#	frontend/src/view/create-campaign/edit-campaign.page.tsx
#	frontend/src/view/dataset-list/dataset-list.page.tsx
#	frontend/src/view/global-components/osmose-bar/osmose-bar.component.tsx
#	frontend/src/view/global-components/skeleton/skeleton.component.tsx
#	frontend/src/view/login.page.tsx
#	frontend/tsconfig.json
#	frontend/vite.config.ts
…ame-tag-to-label

# Conflicts:
#	frontend/src/view/audio-annotator/audio-annotator.page.tsx
#	frontend/src/view/audio-annotator/components/workbench.component.tsx
@ElodieENSTA ElodieENSTA merged commit aeda570 into master Jun 24, 2024
3 checks passed
@ElodieENSTA ElodieENSTA deleted the feature/ADEV-63-Rename-tag-to-label branch June 24, 2024 11:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Merged
Development

Successfully merging this pull request may close these issues.

2 participants