Patchtest: Add a conflict #7
Closed
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
mahagr
pushed a commit
to mahagr/joomla-cms
that referenced
this pull request
Mar 20, 2013
Abstracting JInstallerAdapter element creation
dextercowley
pushed a commit
to dextercowley/joomla-cms
that referenced
this pull request
Apr 11, 2013
dbhurley
pushed a commit
that referenced
this pull request
Oct 9, 2013
Fixing reported bugs (starting by last) Part 2
Closed
Closed
wilsonge
pushed a commit
that referenced
this pull request
Apr 7, 2016
mwatt
pushed a commit
to mwatt/joomla-cms
that referenced
this pull request
Jul 2, 2016
fix conflicts 3) #__languages
mwatt
pushed a commit
to mwatt/joomla-cms
that referenced
this pull request
Jul 2, 2016
Revert "Added files via upload"
continga
pushed a commit
to continga/joomla-cms
that referenced
this pull request
Sep 16, 2018
This is the 1st commit message: > First WIP version of supporting nested subforms. This is the commit message joomla#2: > Fix nested subforms not getting correct name attribute on input fields. This is the commit message joomla#3: > Fix subform rows having invalid index, fix small typo. This is the commit message joomla#4: > Replace the unique subform id via random bytes by just an increasing integer in the fields type rendering process. This is the commit message joomla#5: > Implement feedback from PR at Joomla; > - Use a <template> HTML element for the template of the subform rows, > not a url encoded string inside of a <script> element. > - Fix code style errors reported by phpcs. > - Make the fixing of the unique attributes (name, id, etc) of input elements > of nested subform rows more errorprone, using the same method as the main > subform row. > - Manually add a minified version of the javascript file. This is the commit message joomla#6: > Fix failing javascript tests due to changed structure of subform repeatable template container. This is the commit message joomla#7: > Change subform repeatable javascript test to correctly check on > 0-indexed rows, previously they have been 1-indexed. This is the commit message joomla#8: > Fix a problem where multi-level subforms on the same level doesnt trigger their template correctly. > Additionally added a note why the fixScripts() method is broken and how it could get better.
mbabker
pushed a commit
that referenced
this pull request
Sep 22, 2018
* This is a combination of 8 commits. This is the 1st commit message: > First WIP version of supporting nested subforms. This is the commit message #2: > Fix nested subforms not getting correct name attribute on input fields. This is the commit message #3: > Fix subform rows having invalid index, fix small typo. This is the commit message #4: > Replace the unique subform id via random bytes by just an increasing integer in the fields type rendering process. This is the commit message #5: > Implement feedback from PR at Joomla; > - Use a <template> HTML element for the template of the subform rows, > not a url encoded string inside of a <script> element. > - Fix code style errors reported by phpcs. > - Make the fixing of the unique attributes (name, id, etc) of input elements > of nested subform rows more errorprone, using the same method as the main > subform row. > - Manually add a minified version of the javascript file. This is the commit message #6: > Fix failing javascript tests due to changed structure of subform repeatable template container. This is the commit message #7: > Change subform repeatable javascript test to correctly check on > 0-indexed rows, previously they have been 1-indexed. This is the commit message #8: > Fix a problem where multi-level subforms on the same level doesnt trigger their template correctly. > Additionally added a note why the fixScripts() method is broken and how it could get better. * Commit code styling errors and add an aria label for the outermost 'add' button. * Fix double group-add button on repeatable subform type.
continga
pushed a commit
to continga/joomla-cms
that referenced
this pull request
Sep 24, 2018
This is the 1st commit message: First WIP version of supporting nested subforms. This is the commit message joomla#2: Fix nested subforms not getting correct name attribute on input fields. This is the commit message joomla#3: Fix subform rows having invalid index, fix small typo. This is the commit message joomla#4: Replace the unique subform id via random bytes by just an increasing integer in the fields type rendering process. This is the commit message joomla#5: Implement feedback from PR at Joomla; - Use a <template> HTML element for the template of the subform rows, not a url encoded string inside of a <script> element. - Fix code style errors reported by phpcs. - Make the fixing of the unique attributes (name, id, etc) of input elements of nested subform rows more errorprone, using the same method as the main subform row. - Manually add a minified version of the javascript file. This is the commit message joomla#6: Fix failing javascript tests due to changed structure of subform repeatable template container. This is the commit message joomla#7: Change subform repeatable javascript test to correctly check on 0-indexed rows, previously they have been 1-indexed. This is the commit message joomla#8: Fix a problem where multi-level subforms on the same level doesnt trigger their template correctly. Additionally added a note why the fixScripts() method is broken and how it could get better. This is the commit message joomla#9: First commit which integrates the subform custom field type. This is the commit message joomla#10: Rename manifest file for plg_fields_subform This is the commit message joomla#11: plg_fields_subform: Improve code comments and made the subform field type optionally non-repeatable. This is the commit message joomla#12: Fix not being able to change the type of a subfield. This is the commit message joomla#13: Implement a small in-memory renderCache for subform custom fields This is the commit message joomla#14: Prepare to load the subfields into a subform custom field directly via their own xml definition. This is the commit message joomla#15: After merge with PR joomla#17552 we can now successfully show the subforms options for the different types. This is the commit message joomla#16: The subform custom field type doesnt need a default value. This is the commit message joomla#17: Implement an option for a subform customfield to disable rendering the field values. This is the commit message joomla#18: Remove unused code and set hidden fields to not-required. This is the commit message joomla#19: Reset for dev
continga
pushed a commit
to continga/joomla-cms
that referenced
this pull request
Sep 24, 2018
This is the 1st commit message: First commit which integrates the subform custom field type. This is the commit message joomla#2: Rename manifest file for plg_fields_subform This is the commit message joomla#3: plg_fields_subform: Improve code comments and made the subform field type optionally non-repeatable. This is the commit message joomla#4: Fix not being able to change the type of a subfield. This is the commit message joomla#5: Implement a small in-memory renderCache for subform custom fields This is the commit message joomla#6: Prepare to load the subfields into a subform custom field directly via their own xml definition. This is the commit message joomla#7: After merge with PR joomla#17552 we can now successfully show the subforms options for the different types. This is the commit message joomla#8: The subform custom field type doesnt need a default value. This is the commit message joomla#9: Implement an option for a subform customfield to disable rendering the field values. This is the commit message joomla#10: Remove unused code and set hidden fields to not-required.
continga
pushed a commit
to continga/joomla-cms
that referenced
this pull request
Sep 24, 2018
This is the 1st commit message: First commit which integrates the subform custom field type. This is the commit message joomla#2: Rename manifest file for plg_fields_subform This is the commit message joomla#3: plg_fields_subform: Improve code comments and made the subform field type optionally non-repeatable. This is the commit message joomla#4: Fix not being able to change the type of a subfield. This is the commit message joomla#5: Implement a small in-memory renderCache for subform custom fields This is the commit message joomla#6: Prepare to load the subfields into a subform custom field directly via their own xml definition. This is the commit message joomla#7: After merge with PR joomla#17552 we can now successfully show the subforms options for the different types. This is the commit message joomla#8: The subform custom field type doesnt need a default value. This is the commit message joomla#9: Implement an option for a subform customfield to disable rendering the field values. This is the commit message joomla#10: Remove unused code and set hidden fields to not-required.
continga
pushed a commit
to continga/joomla-cms
that referenced
this pull request
Sep 24, 2018
This is the 1st commit message: First commit which integrates the subform custom field type. This is the commit message joomla#2: Rename manifest file for plg_fields_subform This is the commit message joomla#3: plg_fields_subform: Improve code comments and made the subform field type optionally non-repeatable. This is the commit message joomla#4: Fix not being able to change the type of a subfield. This is the commit message joomla#5: Implement a small in-memory renderCache for subform custom fields This is the commit message joomla#6: Prepare to load the subfields into a subform custom field directly via their own xml definition. This is the commit message joomla#7: After merge with PR joomla#17552 we can now successfully show the subforms options for the different types. This is the commit message joomla#8: The subform custom field type doesnt need a default value. This is the commit message joomla#9: Implement an option for a subform customfield to disable rendering the field values. This is the commit message joomla#10: Remove unused code and set hidden fields to not-required.
continga
pushed a commit
to continga/joomla-cms
that referenced
this pull request
Sep 24, 2018
First commit which integrates the subform custom field type. This is the commit message joomla#2: Rename manifest file for plg_fields_subform This is the commit message joomla#3: plg_fields_subform: Improve code comments and made the subform field type optionally non-repeatable. This is the commit message joomla#4: Fix not being able to change the type of a subfield. This is the commit message joomla#5: Implement a small in-memory renderCache for subform custom fields This is the commit message joomla#6: Prepare to load the subfields into a subform custom field directly via their own xml definition. This is the commit message joomla#7: After merge with PR joomla#17552 we can now successfully show the subforms options for the different types. This is the commit message joomla#8: The subform custom field type doesnt need a default value. This is the commit message joomla#9: Implement an option for a subform customfield to disable rendering the field values. This is the commit message joomla#10: Remove unused code and set hidden fields to not-required. Signed-off-by: Rene Pasing <[email protected]>
continga
pushed a commit
to continga/joomla-cms
that referenced
this pull request
Oct 1, 2018
First commit which integrates the subform custom field type. This is the commit message joomla#2: Rename manifest file for plg_fields_subform This is the commit message joomla#3: plg_fields_subform: Improve code comments and made the subform field type optionally non-repeatable. This is the commit message joomla#4: Fix not being able to change the type of a subfield. This is the commit message joomla#5: Implement a small in-memory renderCache for subform custom fields This is the commit message joomla#6: Prepare to load the subfields into a subform custom field directly via their own xml definition. This is the commit message joomla#7: After merge with PR joomla#17552 we can now successfully show the subforms options for the different types. This is the commit message joomla#8: The subform custom field type doesnt need a default value. This is the commit message joomla#9: Implement an option for a subform customfield to disable rendering the field values. This is the commit message joomla#10: Remove unused code and set hidden fields to not-required. Signed-off-by: Rene Pasing <[email protected]>
15 tasks
dgrammatiko
referenced
this pull request
in dgrammatiko/joomla-cms
Apr 12, 2021
Exclude Bootstrap DropDowns
fancyFranci
pushed a commit
to fancyFranci/joomla-cms
that referenced
this pull request
Jun 19, 2022
[4.1] Keyboard Shortcuts Plugin Setup
LadySolveig
pushed a commit
to LadySolveig/joomla-cms
that referenced
this pull request
Jan 30, 2024
Add System Messages Panel
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.
This should conflict with Add a line