Patchtest: Add a conflict #7

elkuku · 2011-10-14T19:03:49Z

This should conflict with Add a line

Abstracting JInstallerAdapter element creation

Update

Fixing reported bugs (starting by last) Part 2

Closes #7

fix conflicts 3) #__languages

Revert "Added files via upload"

Merge from staging #7

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 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.

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

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.

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]>

Metismenu frontend

Exclude Bootstrap DropDowns

[4.1] Keyboard Shortcuts Plugin Setup

Add System Messages Panel

Add a conflict

3b374a6

elkuku closed this Jan 7, 2012

mahagr pushed a commit to mahagr/joomla-cms that referenced this pull request Mar 20, 2013

Merge pull request joomla#7 from mahagr/installAbstract

88f0902

Abstracting JInstallerAdapter element creation

dextercowley pushed a commit to dextercowley/joomla-cms that referenced this pull request Apr 11, 2013

Merge pull request joomla#7 from joomla/master

4a2aa2c

Update

dbhurley pushed a commit that referenced this pull request Oct 9, 2013

Merge pull request #7 from beat/jux-layout-items

ab009e0

Fixing reported bugs (starting by last) Part 2

thinkerytim mentioned this pull request Feb 2, 2015

redirect plugin unknown column header error #5953

Closed

maxdel85 mentioned this pull request Mar 6, 2015

Error redirect #6333

Closed

Pikkolo mentioned this pull request Apr 14, 2015

Whenever trying to create a new menu voice #6778

Closed

sovainfo mentioned this pull request Apr 15, 2015

[fix] getMessage doesn't exist, use getError instead. #6783

Closed

tgv604 mentioned this pull request May 28, 2015

restricted Contact page displays error stack instead of 404 or 403 error page #7053

Closed

FreeMindedMedia mentioned this pull request Jul 13, 2015

jos-Warning: exception 'RuntimeException' with message 'Unknown column 'header' #7429

Closed

jlainezs mentioned this pull request Sep 13, 2015

restricted Contact page displays error stack instead of 404 or 403 error page (Fix #7053) #7867

Merged

Thovt mentioned this pull request Sep 22, 2015

Joomla jos-warning #7929

Closed

waveywhite mentioned this pull request Sep 25, 2015

Error in com_contact for component URL when access not allowed #7944

Closed

wilsonge pushed a commit that referenced this pull request Apr 7, 2016

Sort the fields based on their text attribute

32ebf5a

Closes #7

stutteringp0et mentioned this pull request Apr 11, 2016

JApplicationWeb::setHeader/sendHeaders behavior #9836

Merged

photodude mentioned this pull request May 5, 2016

HHVM errors from Travis ci #10220

Closed

TalosDx mentioned this pull request May 11, 2016

Error in joomla.org and other site's with Joomla #10419

Closed

mwatt pushed a commit to mwatt/joomla-cms that referenced this pull request Jul 2, 2016

Merge pull request joomla#7 from alikon/patch-64

9d1b889

fix conflicts 3) #__languages

mwatt pushed a commit to mwatt/joomla-cms that referenced this pull request Jul 2, 2016

Merge pull request joomla#7 from brianteeman/revert-6-punycode-js

59bdad2

Revert "Added files via upload"

dautrich mentioned this pull request Aug 22, 2016

Feed Syndication no longer working in J! 3.6.x #11705

Closed

photodude mentioned this pull request Nov 23, 2016

[Unit Test improvements] Use getMockBuilder rather than getMock directly #12990

Merged

wilsonge pushed a commit that referenced this pull request Jan 23, 2017

Merge pull request #302 from C-Lodder/merge-6

89eee6a

Merge from staging #7

C-Lodder mentioned this pull request Feb 9, 2017

[J4.0] [com_finder] SQL error on "maps" view #13997

Closed

jsubri mentioned this pull request Apr 7, 2017

[37] Intermitent 500 with JForm::getInstance could not load file #15153

Closed

elkuku deleted the patchtest2 branch April 19, 2017 05:03

nuncanada mentioned this pull request Jun 22, 2017

Menu item specific template style is not working #16805

Closed

tallandtrue mentioned this pull request Nov 7, 2018

[4.0] Could not connect to database during installation #22956

Closed

grantg182 mentioned this pull request Oct 29, 2019

Error: Failed to start application: Failed to start application #26861

Closed

toivo mentioned this pull request May 4, 2020

[4.0] Converting several mails to mail templates #28722

Merged

15 tasks

toivo mentioned this pull request May 27, 2020

[4.0]Feed Display module uncaught error in rss.xml feed #29236

Closed

hans2103 referenced this pull request in hans2103/joomla-cms Aug 11, 2020

Merge pull request #7 from hans2103/metismenu-frontend

f271621

Metismenu frontend

cloudfaction mentioned this pull request Mar 22, 2021

Update to J4 gives error JEventDispatcher when searching site #32805

Closed

dgrammatiko referenced this pull request in dgrammatiko/joomla-cms Apr 12, 2021

Merge pull request #7 from dgrammatiko/paint

7621241

Exclude Bootstrap DropDowns

boris-grinac mentioned this pull request Dec 18, 2021

Joomla 4.04: upgrade to 4.05 fails, upgrade process freezes with now messages #36349

Closed

oorzaak mentioned this pull request Apr 15, 2022

Frontend editable module of "Custom" type cannot be saved anymore #37438

Open

DonPedro34 mentioned this pull request Jun 3, 2022

When using the Joomla 4 API to Create an Article it fails (500) as soon as an Editor Plugin is installed #37975

Closed

fancyFranci pushed a commit to fancyFranci/joomla-cms that referenced this pull request Jun 19, 2022

Merge pull request joomla#7 from Krshivam25/keyboard-shortcut

9011e23

[4.1] Keyboard Shortcuts Plugin Setup

roscofil mentioned this pull request Sep 13, 2022

[RESOLVED] Apparent login module crash when upgrading Joomla 4 website to php 8.0 #38749

Closed

ahotzler mentioned this pull request Apr 19, 2023

Error "setcookie(): Expects exactly 3 arguments when argument #3 ($expires_or_options) is an array" when Cookie Lifetime in Language Filter is set to Year #40421

Closed

Breiti85 mentioned this pull request Oct 19, 2023

[4.4.0] Joomla\CMS\Mail\MailerFactory::createMailer(): Return value must be of type Joomla\CMS\Mail\MailerInterface, Joomla\CMS\Mail\Mail returned #42164

Closed

LadySolveig pushed a commit to LadySolveig/joomla-cms that referenced this pull request Jan 30, 2024

Merge pull request joomla#7 from coolcat-creations/macjoom-dark-ccc

928757d

Add System Messages Panel

alecrespi78 mentioned this pull request Apr 17, 2024

Update Sites - Joomla! Core (Could not load root metadata) #43287

Closed

robertparts mentioned this pull request Jun 20, 2024

Field Groups - search by ID: #43679

Closed

peter1szalatnay mentioned this pull request Oct 11, 2024

[5.1] Passkey login events missing subjects #44229

Closed

This was referenced Oct 26, 2024

[4.4] UserFactoryAware and 3rd party extensions #42373

Closed

Plugin\Finder\Content\Extension\Content::onFinderAfterSave() error #42617

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Patchtest: Add a conflict #7

Patchtest: Add a conflict #7

elkuku commented Oct 14, 2011

Patchtest: Add a conflict #7

Patchtest: Add a conflict #7

Conversation

elkuku commented Oct 14, 2011