MERGING RELEASE branches #32
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
Member
delcroip
commented
Jun 22, 2023
delcroip
commented
Submodules should not specify library version because a difference with the main module would cause some very strange errors.
OP-824: Fixed locations dry run
Feature/extracts
OP-898: Add confirmation popup to XML upload
Rework of the register page
Added FE items import/export in csv,xls...
Added services import/export
OIF-6: Expanding tools_js by adding insuree import export panel
…ith BE check (#26) Co-authored-by: lruzicki <lruzicki@gmail.com>
MERGING RELEASE branches
* OP-1387: Missing translation keys added * OP-1387: Spelling fix
* OP-1386: Download extracts buttons fix. * OP-1386: Variable name change in extracts.
MERGING RELEASE branches
|
@dragos-dobre who will fix that ? |
hirensoni913
approved these changes
Jul 6, 2023
|
@delcroip Can you resolve the conflicts please? |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| 131215, 131216, 131217, 131218, 131219, 131220, 131221, 131222, 131223, | ||
| 131201, 131202, 131203, 131204, 131205, 131206, 131207, 131208, 131209, | ||
| 131210, 131211, 131212, 131213, 131214, 131215, 131216, 131217, 131218, | ||
| 131219, 131220, 131221, 131222, 131223, RIGHT_REPORT_ADD, RIGHT_REPORT_EDIT, 131226 |
Check warning
Code scanning / CodeQL
Variable not declared before use Warning
| 131215, 131216, 131217, 131218, 131219, 131220, 131221, 131222, 131223, | ||
| 131201, 131202, 131203, 131204, 131205, 131206, 131207, 131208, 131209, | ||
| 131210, 131211, 131212, 131213, 131214, 131215, 131216, 131217, 131218, | ||
| 131219, 131220, 131221, 131222, 131223, RIGHT_REPORT_ADD, RIGHT_REPORT_EDIT, 131226 |
Check warning
Code scanning / CodeQL
Variable not declared before use Warning
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.