Skip to content

Commit cccdf8e

Browse files
YatharthVyasYatharthVyas
authored
Merge branch '4.1-dev' into feature-module-workflow
2 parents 64ee7b2 + 6121d25 commit cccdf8e

File tree

340 files changed

+17780
-10185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

340 files changed

+17780
-10185
lines changed

‎.drone.yml‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -181,25 +181,6 @@ steps:
181181
status:
182182
- failure
183183

184-
- name: analysis4x
185-
image: rips/rips-cli:3.2.2
186-
failure: ignore
187-
depends_on: [ api-tests ]
188-
when:
189-
repo:
190-
- joomla/joomla-cms
191-
branch:
192-
- 4.0-dev
193-
commands:
194-
- export RIPS_BASE_URI='https://api.rips.joomla.org'
195-
- rips-cli rips:list --table=scans --parameter filter='{"__and":[{"__lessThan":{"percent":100}}]}'
196-
- rips-cli rips:scan:start --progress --application=2 --threshold=0 --path=$(pwd) --remove-code --remove-upload --tag=$DRONE_REPO_NAMESPACE-$DRONE_BRANCH || { echo "Please contact the security team at [email protected]"; exit 1; }
197-
environment:
198-
RIPS_EMAIL:
199-
from_secret: RIPS_EMAIL
200-
RIPS_PASSWORD:
201-
from_secret: RIPS_PASSWORD
202-
203184
branches:
204185
exclude: [ l10n_* ]
205186

@@ -270,6 +251,6 @@ steps:
270251

271252
---
272253
kind: signature
273-
hmac: d9dd36c1bf3ac28d03a3a2e7593357ed2f5dd87a098be4115fb4c844b9304eab
254+
hmac: 2b1ca61bdae1a8fe36dc5cdf0497d42d8f3f30df4f0f6e5d248fbfe00be69e48
274255

275256
...

‎.github/workflows/cacert-update.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Cron to update Mozilla CaCert files in the Joomla Core
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
# * is a special character in YAML so you have to quote this string
7+
# Runs on the first day of every month at 03:00
8+
- cron: '0 3 1 * *'
9+
10+
jobs:
11+
build:
12+
if: (github.event_name == 'schedule' && github.repository == 'joomla/joomla-cms') || (github.event_name != 'schedule')
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
with:
19+
ref: 3.10-dev
20+
21+
- name: Download the latest cacert file
22+
uses: wei/wget@v1
23+
with:
24+
args: -O libraries/src/Http/Transport/cacert.pem https://curl.se/ca/cacert.pem
25+
26+
- name: Copy the cacert file to the FOF repo
27+
run: cp "libraries/src/Http/Transport/cacert.pem" "libraries/fof/download/adapter/cacert.pem"
28+
29+
- name: Create Pull Request
30+
uses: peter-evans/create-pull-request@v3
31+
id: cpr
32+
with:
33+
branch: mozilla_ca_update
34+
35+
- name: Log resulting Pull Request
36+
run: |
37+
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
38+
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Overview
1111
---------------------
1212
* This is the source of Joomla! 4.x.
1313
* Joomla's [Official website](https://www.joomla.org).
14-
* Joomla! 4.0 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_4.0_version_history).
14+
* Joomla! 4.1 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_4.1_version_history).
1515
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/4.0-dev).
1616

1717
What is Joomla?

‎README.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Joomla! CMS™
33
1- Overview
44
* This is a Joomla! 4.x installation/upgrade package.
55
* Joomla! Official site: https://www.joomla.org
6-
* Joomla! 4.0 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_4.0_version_history
6+
* Joomla! 4.1 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_4.1_version_history
77
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/4.0-dev
88

99
2- What is Joomla?

‎administrator/components/com_actionlogs/config.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<config addfieldprefix="Joomla\Component\Actionlogs\Administrator\Field">
3+
<help key="User_Actions_Log:_Options"/>
34
<fieldset name="actionlogs" label="COM_ACTIONLOGS_OPTIONS">
45
<field
56
name="ip_logging"

‎administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class HtmlView extends BaseHtmlView
8282
* Setting if the date should be displayed relative to the current date.
8383
*
8484
* @var boolean
85-
* @since __DEPLOY_VERSION__
85+
* @since 4.1.0
8686
*/
8787
protected $dateRelative = false;
8888

@@ -140,6 +140,6 @@ protected function addToolbar()
140140
$bar = Toolbar::getInstance('toolbar');
141141
$bar->appendButton('Confirm', 'COM_ACTIONLOGS_PURGE_CONFIRM', 'delete', 'COM_ACTIONLOGS_TOOLBAR_PURGE', 'actionlogs.purge', false);
142142
ToolbarHelper::preferences('com_actionlogs');
143-
ToolbarHelper::help('JHELP_COMPONENTS_ACTIONLOGS');
143+
ToolbarHelper::help('User_Actions_Log');
144144
}
145145
}

‎administrator/components/com_admin/script.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,6 +1456,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
14561456
'/administrator/components/com_joomlaupdate/helpers/select.php',
14571457
'/administrator/components/com_joomlaupdate/joomlaupdate.php',
14581458
'/administrator/components/com_joomlaupdate/models/default.php',
1459+
'/administrator/components/com_joomlaupdate/restore.php',
14591460
'/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php',
14601461
'/administrator/components/com_joomlaupdate/views/default/tmpl/default.php',
14611462
'/administrator/components/com_joomlaupdate/views/default/tmpl/default.xml',
@@ -4020,8 +4021,12 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
40204021
'/media/com_contenthistory/js/jquery.pretty-text-diff.js',
40214022
'/media/com_contenthistory/js/jquery.pretty-text-diff.min.js',
40224023
'/media/com_finder/js/autocompleter.js',
4024+
'/media/com_joomlaupdate/js/encryption.js',
4025+
'/media/com_joomlaupdate/js/encryption.min.js',
40234026
'/media/com_joomlaupdate/js/json2.js',
40244027
'/media/com_joomlaupdate/js/json2.min.js',
4028+
'/media/com_joomlaupdate/js/update.js',
4029+
'/media/com_joomlaupdate/js/update.min.js',
40254030
'/media/contacts/images/con_address.png',
40264031
'/media/contacts/images/con_fax.png',
40274032
'/media/contacts/images/con_info.png',
@@ -6098,6 +6103,12 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
60986103
'/templates/cassiopeia/css/global/fonts-web_roboto+noto-sans.min.css.gz',
60996104
'/templates/cassiopeia/scss/global/fonts-web_fira-sans.scss',
61006105
'/templates/cassiopeia/scss/global/fonts-web_roboto+noto-sans.scss',
6106+
// From 4.0.3 to 4.0.4
6107+
'/administrator/templates/atum/scss/_mixin.scss',
6108+
'/media/com_joomlaupdate/js/encryption.min.js.gz',
6109+
'/media/com_joomlaupdate/js/update.min.js.gz',
6110+
'/templates/cassiopeia/images/system/sort_asc.png',
6111+
'/templates/cassiopeia/images/system/sort_desc.png',
61016112
);
61026113

61036114
$folders = array(
@@ -7355,6 +7366,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
73557366
'/libraries/vendor/algo26-matthias/idna-convert/tests/unit',
73567367
'/libraries/vendor/algo26-matthias/idna-convert/tests/integration',
73577368
'/libraries/vendor/algo26-matthias/idna-convert/tests',
7369+
// From 4.0.3 to 4.0.4
7370+
'/templates/cassiopeia/images/system',
73587371
);
73597372

73607373
$status['files_checked'] = $files;

‎administrator/components/com_admin/src/Model/HelpModel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function &getPage()
9393
{
9494
if (is_null($this->page))
9595
{
96-
$this->page = Help::createUrl(Factory::getApplication()->input->get('page', 'JHELP_START_HERE'));
96+
$this->page = Help::createUrl(Factory::getApplication()->input->get('page', 'Start_Here'));
9797
}
9898

9999
return $this->page;

‎administrator/components/com_admin/src/View/Sysinfo/HtmlView.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,6 @@ protected function addToolbar(): void
120120
'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_JSON',
121121
'download'
122122
);
123-
ToolbarHelper::help('JHELP_SITE_SYSTEM_INFORMATION');
123+
ToolbarHelper::help('Site_System_Information');
124124
}
125125
}

‎administrator/components/com_admin/tmpl/help/default.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
</button>
3131
<div class="sidebar-nav" id="help-index">
3232
<ul class="nav flex-column">
33-
<li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_START_HERE'), Text::_('COM_ADMIN_START_HERE'), ['target' => 'helpFrame']); ?></li>
33+
<li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('Start_Here'), Text::_('COM_ADMIN_START_HERE'), ['target' => 'helpFrame']); ?></li>
3434
<li class="item"><?php echo HTMLHelper::_('link', 'https://www.gnu.org/licenses/gpl-2.0.html', Text::_('COM_ADMIN_LICENSE'), ['target' => 'helpFrame']); ?></li>
35-
<li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_GLOSSARY'), Text::_('COM_ADMIN_GLOSSARY'), ['target' => 'helpFrame']); ?></li>
35+
<li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('Glossary'), Text::_('COM_ADMIN_GLOSSARY'), ['target' => 'helpFrame']); ?></li>
3636
<li class="divider"></li>
3737
<li class="nav-header"><?php echo Text::_('COM_ADMIN_ALPHABETICAL_INDEX'); ?></li>
3838
<?php foreach ($this->toc as $k => $v) : ?>
3939
<li class="item">
40-
<?php $url = Help::createUrl('JHELP_' . strtoupper($k)); ?>
40+
<?php $url = Help::createUrl($k); ?>
4141
<?php echo HTMLHelper::_('link', $url, $v, ['target' => 'helpFrame']); ?>
4242
</li>
4343
<?php endforeach; ?>

0 commit comments

Comments
 (0)