Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.0] s/.htacess/.htaccess #35613

Merged
merged 1 commit into from Sep 20, 2021
Merged

[4.0] s/.htacess/.htaccess #35613

merged 1 commit into from Sep 20, 2021

Conversation

tecpromotion
Copy link
Contributor

Summary of Changes

typo in filename

Testing Instructions

.

Actual result BEFORE applying this Pull Request

.htacess

Expected result AFTER applying this Pull Request

.htaccess

Documentation Changes Required

.

@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-4.0-dev labels Sep 20, 2021
@PhilETaylor

This comment was marked as abuse.

@Quy Quy added this to the Joomla 4.0.4 milestone Sep 20, 2021
@zero-24 zero-24 merged commit f575a49 into joomla:4.0-dev Sep 20, 2021
@zero-24
Copy link
Contributor

zero-24 commented Sep 20, 2021

Merging thanks.

@tecpromotion tecpromotion deleted the patch-5 branch September 20, 2021 16:39
Kostelano added a commit to JPathRu/localisation that referenced this pull request Sep 25, 2021
brianteeman pushed a commit to brianteeman/joomla-cms that referenced this pull request Oct 3, 2021
bembelimen added a commit that referenced this pull request Nov 21, 2021
* Add sensible inline help to Global Configuration

* Button to show/hide inline help

Example in backend com_config

* Add back the error handling

* Show how this can be done in the frontend, too

* Update build/media_source/system/js/inlinehelp.es6.js

Co-authored-by: Brian Teeman <brian@teeman.net>

* Update build/media_source/system/js/inlinehelp.es6.js

Co-authored-by: Dimitris Grammatikogiannis <dg@dgrammatiko.dev>

* Address inconsistency of control and description DIV id's

The controls have IDs like `jform_example`.

The description DIVs had IDs like `jform[example]-desc`.

This is horribly inconsistent and a pain to work with.

Converted the description DIV IDs to the more consistent
form `jform_example-desc`.

* Toggle the aria-describedby attribute to follow the visibility of the description

* Use simpler English

* Make this into a proper BUTTON element and end–align it

* Update administrator/language/en-GB/joomla.ini

Co-authored-by: Quy <quy@fluxbb.org>

* Update language string

* Update language/en-GB/com_config.ini

Co-authored-by: Brian Teeman <brian@teeman.net>

* Clarify SEF URLs

* Apply suggestions from code review

DocBlock updates

Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>

* [4.x] Tinymce updates (#35605)

See https://www.tiny.cloud/docs/changelog/ for details

This includes 5.9.0, 5.9.1 and 5.9.2

* typo in filename (#35613)

* Remove JHELP_ strings for com_config and move the ref_key to the config.xml of the respective component. (#35479)

Co-authored-by: Thomas Hunziker <werbemails@bakual.ch>

* [4.0] Fix modal data attributes (#35626)

* Update main.php

* Update Bootstrap.php

* [4.0] Remove JHELP_ strings for com_categories (#35534)

* Category custom fields marked as 'subform' act as if they are not (#35547)

* Subform–only fields cause saving a category to fail.

Part I: “Only Use In Subform” doesn't do anything

* Subform–only fields cause saving a category to fail.

Part II. PlgSystemFields::onContentPrepareForm doesn't actually work for com_categories

Close gh-35543

* Subform–only fields cause saving a category to fail.

Part II. PlgSystemFields::onContentPrepareForm doesn't actually work for com_categories

This should only apply on com_content categories, not
third party categories.

* Invert the if–block order

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

* Subform–only fields cause saving a category to fail.

Part II. PlgSystemFields::onContentPrepareForm doesn't actually work for com_categories

Okay, it could actually apply for any category,
not just com_content.

* Docblock

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

* [4.0] Replace JHELP_ String with hardcoded ref-key (#35429)

* Replace JHELP_ String with hardcoded ref-key

* Simplifying helpTOC.php so it doesn't need to reverse lookup the JHELP_ strings.

* Remove loading of joomla.ini and messing with language class property

* alpha-sort help strings

* Next batch

* Last batch

* Ooops

Co-authored-by: Thomas Hunziker <werbemails@bakual.ch>

* [4][CloudFlare Issues] Remove validation of the session by IP address (#35509)

> IMHO the commend of @arnepluhar in #35509 should also count as a successful test. He did it as a GitHub code review. The rules about what constitutes a valid test should expand to GitHub code reviews; these didn't even exist when the rules were decided upon back in the day and they make FAR MORE SENSE than comments filed on a PR!

Github is configured to allow maintainers merge only if all tests are successful.

Thanks all.

* Language Keys may have a : in it. (#35659)

* Button to show/hide inline help

Example in backend com_config

* Whoops, wrong merge option

* Lang string change

* Apply language string suggestion

* Remove empty line on language file,

* Add sensible inline help to Global Configuration

* Button to show/hide inline help

Example in backend com_config

* Add back the error handling

* Show how this can be done in the frontend, too

* Update build/media_source/system/js/inlinehelp.es6.js

Co-authored-by: Brian Teeman <brian@teeman.net>

* Update build/media_source/system/js/inlinehelp.es6.js

Co-authored-by: Dimitris Grammatikogiannis <dg@dgrammatiko.dev>

* Address inconsistency of control and description DIV id's

The controls have IDs like `jform_example`.

The description DIVs had IDs like `jform[example]-desc`.

This is horribly inconsistent and a pain to work with.

Converted the description DIV IDs to the more consistent
form `jform_example-desc`.

* Toggle the aria-describedby attribute to follow the visibility of the description

* Use simpler English

* Make this into a proper BUTTON element and end–align it

* Update administrator/language/en-GB/joomla.ini

Co-authored-by: Quy <quy@fluxbb.org>

* Update language string

* Update language/en-GB/com_config.ini

Co-authored-by: Brian Teeman <brian@teeman.net>

* Clarify SEF URLs

* Apply suggestions from code review

DocBlock updates

Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>

* Button to show/hide inline help

Example in backend com_config

* Whoops, wrong merge option

* Lang string change

* Apply language string suggestion

* Remove empty line on language file,

Co-authored-by: Brian Teeman <brian@teeman.net>
Co-authored-by: Dimitris Grammatikogiannis <dg@dgrammatiko.dev>
Co-authored-by: Quy <quy@fluxbb.org>
Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>
Co-authored-by: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
Co-authored-by: Thomas Hunziker <github@bakual.ch>
Co-authored-by: Thomas Hunziker <werbemails@bakual.ch>
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: Benjamin Trenkle <bembelimen@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Language Change This is for Translators
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants