Skip to content

Patchtest: Add a conflict#7

Closed
elkuku wants to merge 1 commit intojoomla:playgroundfrom
elkuku:patchtest2
Closed

Patchtest: Add a conflict#7
elkuku wants to merge 1 commit intojoomla:playgroundfrom
elkuku:patchtest2

Conversation

@elkuku
Copy link
Copy Markdown
Contributor

@elkuku elkuku commented Oct 14, 2011

This should conflict with Add a line

@elkuku elkuku closed this Jan 7, 2012
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
@maxdel85 maxdel85 mentioned this pull request Mar 6, 2015
@Thovt Thovt mentioned this pull request Sep 22, 2015
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
wilsonge pushed a commit that referenced this pull request Jan 23, 2017
@elkuku elkuku deleted the patchtest2 branch April 19, 2017 05:03
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.
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 <r.pasing@continga.de>
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 <r.pasing@continga.de>
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 referenced this pull request in LadySolveig/joomla-cms Jan 30, 2024
SniperSister pushed a commit to SniperSister/joomla-cms that referenced this pull request Mar 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant