Support innerLable in datepicker control #566
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
i18n-check The following components have not been translatedWait for the reviewers to check your changes in Weblate and try running github action again. |
added 2 commits
February 3, 2024 17:35
Currently translated at 98.7% (76 of 77 strings) Translation: DataLens/dash.control-dialog.edit__566 Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-6729-inner-label-in-datepicker-566/dash-control-dialog-edit-566/en/
Currently translated at 98.7% (76 of 77 strings) Translation: DataLens/dash.control-dialog.edit__566 Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-6729-inner-label-in-datepicker-566/dash-control-dialog-edit-566/ru/
mournfulCoroner
force-pushed
the
CHARTS-6729-Inner-label-in-datepicker
branch
from
d6a06c0
to
2aacb40
Compare
|
i18n-check Errors occurred when merging changes from your branch with the Weblate branch.``` Rebasing (1/3) Auto-merging package-lock.json CONFLICT (add/add): Merge conflict in package-lock.json Auto-merging package.json CONFLICT (add/add): Merge conflict in package.json Auto-merging src/server/components/features/features-list/SelectorRequiredValue.ts CONFLICT (add/add): Merge conflict in src/server/components/features/features-list/SelectorRequiredValue.ts Auto-merging src/shared/types/feature.ts CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts Auto-merging src/ui/components/Select/hooks/useSelectRenderFilter/useSelectRenderFilter.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Select/hooks/useSelectRenderFilter/useSelectRenderFilter.tsx Auto-merging src/ui/units/collections/components/CollectionContent/CollectionContent.tsx CONFLICT (add/add): Merge conflict in src/ui/units/collections/components/CollectionContent/CollectionContent.tsx Auto-merging src/ui/units/dash/containers/Body/Body.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.scss Auto-merging src/ui/units/workbooks/components/EntryActions/EntryActions.tsx CONFLICT (add/add): Merge conflict in src/ui/units/workbooks/components/EntryActions/EntryActions.tsx Auto-merging tests/docker-compose.e2e.yml CONFLICT (add/add): Merge conflict in tests/docker-compose.e2e.yml error: could not apply d6a06c0... Support innerLable in datepicker control hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm ", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply d6a06c0... Support innerLable in datepicker control (1) ``` |
mournfulCoroner
force-pushed
the
CHARTS-6729-Inner-label-in-datepicker
branch
from
2aacb40
to
12d860c
Compare
|
i18n-check The following components have not been translatedWait for the reviewers to check your changes in Weblate and try running github action again. |
Marginy605
previously approved these changes
Feb 5, 2024
* Translated using Weblate (English) Currently translated at 100.0% (77 of 77 strings) Translation: DataLens/dash.control-dialog.edit__566 Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-6729-inner-label-in-datepicker-566/dash-control-dialog-edit-566/en/ * Translated using Weblate (Russian) Currently translated at 100.0% (77 of 77 strings) Translation: DataLens/dash.control-dialog.edit__566 Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-6729-inner-label-in-datepicker-566/dash-control-dialog-edit-566/ru/ --------- Co-authored-by: Darya Tikhonova <tihonova-d@yandex-team.ru>
|
E2E Report is ready. |
flops
approved these changes
Feb 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.