Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed issue #14900: numerical array with checkboxes lose all data
- Loading branch information
1 parent
5c9aa86
commit 3955ef7
Showing
1 changed file
with
14 additions
and
21 deletions.
There are no files selected for viewing
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
3955ef7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merge conflict. Please merge into develop.
Some CSS is also conflicted. Need to rebuild?
3955ef7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
answer_td_checkboxes.twig should replace content in develop branch.
I don't know anything about other 3 conflicting files and which version should be applied.
3955ef7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dominikvitt Can you ping responsible commiter about it? Use git blame etc to find out.
3955ef7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unsure this one : 8cdcaae make a conflict … re-apply fix is easy.
@dominikvitt : after merging : i look at the merge code :)
3955ef7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
github allow merging … but surely add issue : https://github.com/LimeSurvey/LimeSurvey/pull/1281/files
3955ef7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Renaming id of EM used input : https://www.limesurvey.org/forum/can-i-do-this-with-limesurvey/118582-relevance-equation-in-array-numbers-isn-t-working-in-ls-3-17-4#185355 :)