joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-30 17:13:41 +00:00
Code Packages Releases Activity
47,263 Commits 4 Branches 470 Tags 753 MiB
1c7ce4d3b0
Commit Graph

47263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Translation
1c7ce4d3b0 Language update 2022-02-01 07:31:10 +00:00
Translation
6aa395dd83 Merge remote-tracking branch 'upstream/4.1-dev' into translation 2022-02-01 07:30:48 +00:00
Benjamin Trenkle
7da994cf07
Use correct image variable 2022-02-01 02:33:08 +01:00
Benjamin Trenkle
57e5502dd4
Merge pull request #36905 from bembelimen/upmerges/2022-01-31 
[4.1] Upmerge from 3.10
 2022-02-01 01:31:24 +01:00
Benjamin Trenkle
2b0e1a6a8c
Merge branch '4.1-dev' into upmerges/2022-01-31 2022-02-01 01:31:08 +01:00
Benjamin Trenkle
af4471cc1b
Remove spaces 2022-02-01 01:29:53 +01:00
Benjamin Trenkle
91a52989fd
Fix wrong upmerges 2022-02-01 01:27:48 +01:00
Quy
ca423557ad
Typos (#36902) 2022-01-31 22:01:11 +01:00
Benjamin Trenkle
7b631c1b82
Merge branch '3.10-dev' into 4.1-dev 2022-01-31 21:56:44 +01:00
Benjamin Trenkle
9eed9d0866
Merge commit '3ab59cbc54304266c4fde0f8f3527aac462b3d6c' into 4.1-dev 
# Conflicts:
#	.gitignore
#	composer.lock
#	libraries/vendor/composer/installed.json
#	libraries/vendor/composer/installed.php
#	libraries/vendor/joomla/application/src/AbstractDaemonApplication.php
#	libraries/vendor/joomla/application/src/AbstractWebApplication.php
#	libraries/vendor/joomla/application/src/Cli/CliOutput.php
#	libraries/vendor/joomla/application/src/Cli/Output/Processor/ColorProcessor.php
#	libraries/vendor/joomla/application/src/Web/WebClient.php
#	libraries/vendor/joomla/string/src/StringHelper.php
#	libraries/vendor/joomla/string/src/phputf8/mbstring/core.php
#	libraries/vendor/joomla/string/src/phputf8/strcasecmp.php
#	libraries/vendor/joomla/string/src/phputf8/utf8.php
#	libraries/vendor/joomla/string/src/phputf8/utils/position.php
#	libraries/vendor/joomla/string/src/phputf8/utils/validation.php
#	libraries/vendor/joomla/uri/src/AbstractUri.php
#	libraries/vendor/joomla/uri/src/UriHelper.php
#	libraries/vendor/joomla/uri/src/UriInterface.php
 2022-01-31 21:56:21 +01:00
Benjamin Trenkle
da1351671b
Merge commit '226f54e161e2f520d8b43fdeaaf2f9cbaab6a3fd' into 4.1-dev 
# Conflicts:
#	administrator/components/com_config/model/form/application.xml
#	libraries/joomla/session/storage/memcache.php
#	libraries/joomla/session/storage/memcached.php
 2022-01-31 21:49:45 +01:00
Benjamin Trenkle
52074f1ff1
Merge commit '3bbcf65e25e0e81d27b0e1cf40c38671c8658b06' into 4.1-dev 
# Conflicts:
#	layouts/joomla/html/image.php
 2022-01-31 21:46:33 +01:00
Benjamin Trenkle
e01d010a94
Merge commit 'e712ad7b8e7460edac0b6bf969249bcfcbef9f4e' into 4.1-dev 
# Conflicts:
#	modules/mod_breadcrumbs/helper.php
 2022-01-31 21:39:44 +01:00
Benjamin Trenkle
01a18c071a
Merge commit '5ed8cddf8bb743d2ee505b78d8461fb5669751bc' into 4.1-dev 
# Conflicts:
#	administrator/components/com_finder/helpers/indexer/query.php
 2022-01-31 21:35:20 +01:00
Benjamin Trenkle
0a39aa322d
Add fix from upmerge 2022-01-31 21:29:46 +01:00
Benjamin Trenkle
05e716773b
Merge commit '0a1c48fed0441c06a926d830d0901080638fcd90' into 4.1-dev 
# Conflicts:
#	administrator/modules/mod_menu/menu.php
 2022-01-31 21:27:00 +01:00
Benjamin Trenkle
8e42735018
Merge commit 'b90fb91e446e85ada17914315e2915621532d08e' into 4.1-dev 
# Conflicts:
#	libraries/src/Editor/Editor.php
 2022-01-31 21:25:59 +01:00
Benjamin Trenkle
117b71262f
Merge commit 'e5e13294f26fad121405ed2054b027dadeaa1499' into 4.1-dev 
# Conflicts:
#	components/com_users/controllers/registration.php
 2022-01-31 21:24:44 +01:00
Benjamin Trenkle
5baf8f3b14
Merge commit 'a03c3f17bccfe3e8bedbb7d9fd24453bb8b0f910' into 4.1-dev 
# Conflicts:
#	libraries/joomla/database/driver/mysql.php
#	libraries/joomla/database/driver/mysqli.php
#	libraries/joomla/database/driver/pdo.php
#	libraries/joomla/database/driver/pdomysql.php
#	libraries/joomla/database/driver/postgresql.php
 2022-01-31 21:22:27 +01:00
Benjamin Trenkle
eaa0a0c9b1
Merge commit '3de1ce142c0b43fe78bb5b1074d579284b057d4d' into 4.1-dev 2022-01-31 21:20:10 +01:00
Benjamin Trenkle
0afcdad0ac
Merge commit 'd19bbe0dad0b23ceb7f2b181b553811b87e79c82' into 4.1-dev 
# Conflicts:
#	libraries/src/Table/User.php
 2022-01-31 21:16:37 +01:00
Benjamin Trenkle
8c15cf1f98
Merge commit 'df0a0126b86bf9e69035abfb5a48af4987c3d7ed' into 4.1-dev 2022-01-31 21:12:11 +01:00
Benjamin Trenkle
4da927b15e
Merge commit '70213223399c74460b751ed52cad035c3de1265c' into 4.1-dev 
# Conflicts:
#	libraries/src/Document/HtmlDocument.php
 2022-01-31 21:10:43 +01:00
Benjamin Trenkle
b2ca80c1cf
Merge commit 'c0286f0505ebba6c5943c28bdee33ca7e5c3bf51' into 4.1-dev 
# Conflicts:
#	modules/mod_search/mod_search.php
 2022-01-31 21:08:45 +01:00
Benjamin Trenkle
3d4d281cde
Merge commit '61396f74a925a55f1d26932661e7575a4812e9bf' into 4.1-dev 
# Conflicts:
#	templates/beez3/html/modules.php
#	templates/protostar/html/modules.php
#	templates/system/html/modules.php
 2022-01-31 21:07:36 +01:00
Benjamin Trenkle
91b2de72ba
Merge commit 'e02d637b534fcf6f5c1dbe53db67a61db10dc76b' into 4.1-dev 
# Conflicts:
#	administrator/modules/mod_feed/mod_feed.php
#	administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.php
#	administrator/modules/mod_stats_admin/mod_stats_admin.php
#	modules/mod_articles_archive/mod_articles_archive.php
#	modules/mod_articles_categories/mod_articles_categories.php
#	modules/mod_articles_category/mod_articles_category.php
#	modules/mod_articles_latest/mod_articles_latest.php
#	modules/mod_articles_news/mod_articles_news.php
#	modules/mod_articles_popular/mod_articles_popular.php
#	modules/mod_banners/mod_banners.php
#	modules/mod_breadcrumbs/mod_breadcrumbs.php
#	modules/mod_custom/mod_custom.php
#	modules/mod_feed/mod_feed.php
#	modules/mod_footer/mod_footer.php
#	modules/mod_languages/mod_languages.php
#	modules/mod_random_image/mod_random_image.php
#	modules/mod_related_items/mod_related_items.php
#	modules/mod_stats/mod_stats.php
#	modules/mod_syndicate/mod_syndicate.php
#	modules/mod_tags_popular/mod_tags_popular.php
#	modules/mod_tags_similar/mod_tags_similar.php
#	modules/mod_users_latest/mod_users_latest.php
#	modules/mod_whosonline/mod_whosonline.php
#	modules/mod_wrapper/mod_wrapper.php
 2022-01-31 21:03:45 +01:00
Benjamin Trenkle
c34efb47ad
Merge commit 'c7cf2dc7ef82c964c346bfa0d5a657cb754a9d43' into 4.1-dev 
# Conflicts:
#	administrator/components/com_menus/models/item.php
 2022-01-31 20:53:53 +01:00
Benjamin Trenkle
564d782dd8
Merge commit 'aae1bb8a58d699e9610b579b32aac4e5a17ae922' into 4.1-dev 
# Conflicts:
#	plugins/editors/tinymce/tinymce.php
 2022-01-31 20:52:30 +01:00
Benjamin Trenkle
276d9f6dba
Merge commit 'b2206b0d2f2393ba2ff7964d4d9d4906f7c4ee0f' into 4.1-dev 
# Conflicts:
#	libraries/src/Application/WebApplication.php
 2022-01-31 20:47:38 +01:00
Benjamin Trenkle
8bf9a1356b
Merge commit 'f53012f20d219da28b1cf4f710f5d3edcfe71c4b' into 4.1-dev 
# Conflicts:
#	administrator/language/en-GB/en-GB.xml
#	administrator/language/en-GB/install.xml
#	administrator/manifests/files/joomla.xml
#	administrator/manifests/packages/pkg_en-GB.xml
#	installation/language/en-GB/en-GB.xml
#	language/en-GB/en-GB.xml
#	language/en-GB/install.xml
#	libraries/src/Version.php
 2022-01-31 20:46:03 +01:00
Khushi Rauniyar
a068016074
Fixed#36117 -- Underlined links in Joomla Update Section (#36134) 
* Fixed#36117 -- Underlined links in monochrome atum theme

* Underlined links in monochrome atum theme

* Underlined links in monochrome atum theme

Co-authored-by: Quy <quy@fluxbb.org>
Co-authored-by: Christiane Maier-Stadtherr <dev@chmst.de>
 2022-01-31 18:39:57 +01:00
Phil E. Taylor
7a0ae12274
[4.1] Security. Input filters not being applied. (#36376) 
* Method call is provided 3 parameters, but the method signature uses 2 parameters

* Method call is provided 3 parameters, but the method signature uses 2 parameters

* add filter
 2022-01-31 18:34:38 +01:00
Brian Teeman
ea5af7b57c
[4.1] use web asset manager (#36373) 
* [4.1] use web asset manager

First pass for files already using $wa to make sure all scripts are loaded with the web asset manager

* more

* tab

* Update default.php

* get multiselect back to pevious incomplete behavour
 2022-01-31 17:36:35 +01:00
Phil E. Taylor
7fb74af14f
[4.1] native function invocation and a few commas (#36379) 
* [4.0] native function invocation

* native function invocation and trailing commas

Co-authored-by: Quy <quy@fluxbb.org>
 2022-01-31 17:33:13 +01:00
beat
2129ae121f
[4.1] [PHP 8.1] Fix PHP 8.1 deprecation notice for Rules Field (#36834) 
* [4.0] [PHP 8.1] Fix PHP 8.1 deprecation notice for permissions field

Fixes `Deprecated: Automatic conversion of false to array is deprecated in /home/beat/www/4.0/libraries/src/Form/Field/RulesField.php on line 182`

* Update libraries/src/Form/Field/RulesField.php

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

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
 2022-01-31 17:25:25 +01:00
joomla-translation-bot
df4eeaf5b0
Translation Update (#36852) 
* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update

* Language update
 2022-01-31 17:17:40 +01:00
Phil E. Taylor
c5bb6a46a5
Micro optimisation (#36711) 2022-01-31 16:58:48 +01:00
Brian Teeman
da25d59714
Update README.md (#36811) 
* Update README.md

* Update README.txt

* Update README.md

* Update CONTRIBUTING.md
 2022-01-31 16:57:16 +01:00
Brian Teeman
3de9c5a52a
[4.1] codemirror update (#36812) 
## Changelog
5.65.1 Fix miscalculation of vertical positions in lines that have both line widgets and replaced newlines.

5.65.0
Bug fixes
brace-folding addon: Fix broken folding on lines with both braces and square brackets.

New features
vim bindings: Support g0, g$, g.
 2022-01-31 16:56:16 +01:00
Brian Teeman
e67cfa68b3
[4.1] redirect links index (#36817) 
* [4.1] redirect links index

Set the correct index name

* updates

* Update administrator/components/com_admin/sql/updates/postgresql/4.1.0-2022-01-24.sql

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

Co-authored-by: Quy <quy@fluxbb.org>
 2022-01-31 16:54:42 +01:00
Brian Teeman
795617c906
[4.1] s/mashine/machine (#36842) 
spelling & code quality
 2022-01-31 16:35:18 +01:00
Shubhamverma2796
859bdb9127
Fixed Scheduler: "task failed" counts twice (#36868) 
* testing

* Delete new.scss

Deleting useless file.

* removed +1

* removed the if block

* removed the blank line
 2022-01-31 16:25:07 +01:00
Hannes Papenberg
dc2c4b33d9
Template Manager: Fixing return URL (#36871) 2022-01-31 16:19:23 +01:00
Brian Teeman
da2f12c727
[4.1] Modal Buttons :focus [a11y] (#36880) 
When you are navigating the admin using the keyboard all the buttons should indicate when they have focus. For toolbar buttons this has been done correctly and the display of the button changes exactly the same on focus and on hover. This is the bootstrap default behaviour.

Unfortunately the buttons in the modals do not use the bootstrap defaults (_I don't know why_) and there is no styling for on focus.

This PR resolves that so the buttons in modals are styled correctly on focus. Displaying a visual indicator of the current focus is a fundamental accessibility issue.

This PR changes the scss so to test either use a prebuilt package or make sure you remember to `npm run build:css`

Open any modal and using the keyboard tab key navigate to the buttons. Before the PR you don't have any indicator when you are on a button. After the PR the button is styled exactly the same as if  you were hovering with your mouse.
 2022-01-31 16:18:44 +01:00
Brian Teeman
54c473c7f1
[4.1] Web Services - Media - core component (#36882) 
The media webservices plugin is missing from the list of core extensions

Test either by code review or by filtering the list of installed extensions by core/non-core

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
 2022-01-31 16:16:37 +01:00
Allon Moritz
a4fe2289cf
[4.0] Remove the local dependency in the media select field (#36667) 
* Remove the local dependency in the media select field

* cs
 2022-01-31 16:15:02 +01:00
Translation
ee5919e4f2 Language update 2022-01-31 07:32:33 +00:00
Translation
a2ad58a4fe Merge remote-tracking branch 'upstream/4.1-dev' into translation 2022-01-31 07:32:04 +00:00
Brian Teeman
66e097a92e
[4.1] gitignore update (#36895) 
Post the move to placing css files in the media folder this pr updates the gitignore.

No point in ignoring non-existent files ;)
 2022-01-30 19:55:20 +00:00
George Wilson
5de5ab6933
Update release-checklist.md 2022-01-30 13:06:17 +00:00