Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ jobs:
needs: [code-style-php]
strategy:
matrix:
php_version: ['8.1', '8.2', '8.3', '8.4']
php_version: ['8.3', '8.4']
steps:
- uses: actions/checkout@v4
- uses: actions/cache/restore@v4
Expand All @@ -133,7 +133,7 @@ jobs:
needs: [code-style-php]
strategy:
matrix:
php_version: ['8.1', '8.2', '8.3', '8.4']
php_version: ['8.3', '8.4']
config: ['phpunit.xml.dist', 'phpunit-pgsql.xml.dist']
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
needs: [code-style-php]
strategy:
matrix:
php_version: ['8.1', '8.2', '8.3', '8.4']
php_version: ['8.3', '8.4']
steps:
- uses: actions/checkout@v4
- uses: actions/cache/restore@v4
Expand All @@ -200,7 +200,7 @@ jobs:
needs: [code-style-php]
strategy:
matrix:
php_version: ['8.1', '8.2', '8.3', '8.4']
php_version: ['8.3', '8.4']
steps:
- uses: actions/checkout@v4
- uses: actions/cache/restore@v4
Expand Down Expand Up @@ -270,11 +270,11 @@ jobs:
test_group: cmysqlmax
db_engine: mysqli
db_host: mysql
- php_version: '8.1'
- php_version: '8.3'
test_group: cmysql
db_engine: mysqli
db_host: mysql
- php_version: '8.1'
- php_version: '8.3'
test_group: cpostgres
db_engine: pgsql
db_host: postgres
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
[files]
extend-exclude = [
"/templates/system/*.html",
"/administrator/components/com_admin/sql/*",
"/build/media_source/vendor/tinymce/langs/*",
"/installation/language/*",
"includes/*.html",
"!/installation/language/en-GB/",
"/includes/*.html",
"/plugins/sampledata/testing/*",
]

Expand Down Expand Up @@ -40,9 +40,3 @@ supercedes="supercedes" # Valid spelling rejected https://github.com/crate-c
ue="ue" # selector in queries
vertexes="vertexes" # Valid spelling waiting fix https://github.com/crate-ci/typos/issues/1150
wheres="wheres" # $wheres in modules\mod_related_items\src\Helper\RelatedItemsHelper.php

# deprecated strings can be removed in 6.0
configurated="configurated"
discernable="discernable"
hilight="hilight"
mis="mis"
15 changes: 9 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
Joomla! CMS™
====================

The Joomla! 6.0 branch is under heavy development and not all links in this document are available yet
------------------------------------------------------------------------------------------------------

Build Status
------------

| Actions | PHP | Node | npm |
|-------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|----------------------------------------------------------------------------------|
| [![Build Status](https://github.com/joomla/joomla-cms/actions/workflows/ci.yml/badge.svg?branch=5.4-dev)](https://github.com/joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V20.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v10.1.0-green)](https://nodejs.org/en/) |
| [![Build Status](https://github.com/joomla/joomla-cms/actions/workflows/ci.yml/badge.svg?branch=6.0-dev)](https://github.com/joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.3.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V20.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v10.1.0-green)](https://nodejs.org/en/) |

Overview
---------------------
* This is the source of Joomla! 5.x.
* This is the source of Joomla! 6.x.
* Joomla's [Official website](https://www.joomla.org).
* Joomla! 5.4 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_5.4_version_history).
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/5.4-dev).
* Joomla! 6.0 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_6.0_version_history).
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/6.0-dev).

What is Joomla?
---------------------
Expand Down Expand Up @@ -46,9 +49,9 @@ git clone https://github.com/joomla/joomla-cms.git
```bash
cd joomla-cms
```
- Go to the 5.4-dev branch:
- Go to the 6.0-dev branch:
```bash
git checkout 5.4-dev
git checkout 6.0-dev
```
- Install all the needed composer packages:
```bash
Expand Down
20 changes: 12 additions & 8 deletions README.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
Joomla! CMS™

The Joomla! 6.0 branch is under heavy development and not all links in this document are available yet
------------------------------------------------------------------------------------------------------

1- Overview
* This is a Joomla! 5.x installation/upgrade package.
* This is a Joomla! 6.x installation/upgrade package.
* Joomla! Official site: https://www.joomla.org
* Joomla! 5.4 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_5.4_version_history
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/5.4-dev
* Joomla! 6.0 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_6.0_version_history
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/6.0-dev

2- What is Joomla?
* Joomla! is a Content Management System (CMS) which enables you to build websites and powerful online applications.
Expand All @@ -20,10 +23,10 @@ Joomla! CMS™
4- How to find a Joomla! translation?
* Repository of accredited language packs: https://downloads.joomla.org/language-packs
* You can also add languages directly to your website via your Joomla! administration panel: https://docs.joomla.org/Special:MyLanguage/J5.x:Setup_a_Multilingual_Site/Installing_New_Language
* Learn how to setup a Multilingual Joomla! Site: https://docs.joomla.org/Special:MyLanguage/J5.x:Setup_a_Multilingual_Site
* Learn how to setup a Multilingual Joomla! Site: https://docs.joomla.org/Special:MyLanguage/J6.x:Setup_a_Multilingual_Site

5- Learn Joomla!
* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/Special:MyLanguage/J5.x:Getting_Started_with_Joomla!
* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/Special:MyLanguage/J6.x:Getting_Started_with_Joomla!
* Before installing, read the beginners guide: https://docs.joomla.org/Special:MyLanguage/Portal:Beginners

6- What are the benefits of Joomla?
Expand Down Expand Up @@ -54,9 +57,10 @@ Joomla! CMS™
* Post questions at our forums: https://forum.joomla.org
* Joomla! Resources Directory (JRD): https://community.joomla.org/service-providers-directory/

11- Do you already have a Joomla! site that's not built with Joomla! 5.x ?
* What's new in Joomla! 5.x: https://www.joomla.org/5
* What are the main differences between 4.x and 5.x? https://docs.joomla.org/Special:MyLanguage/What_are_the_major_differences_between_Joomla!_4.x_and_5.x
11- Do you already have a Joomla! site that's not built with Joomla! 6.x ?
* What's new in Joomla! 6.x: https://www.joomla.org/6
* What are the main differences between 5.x and 6.x? https://docs.joomla.org/Special:MyLanguage/What_are_the_major_differences_between_Joomla!_5.x_and_6.x
* How to migrate from 5.x to 6.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_5.x_to_6.x_Step_by_Step_Migration
* How to migrate from 4.x to 5.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_4.x_to_5.x_Step_by_Step_Migration
* How to migrate from 3.x to 4.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_3.x_to_4.x_Step_by_Step_Migration
* How to migrate from 2.5.x to 3.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_2.5_to_3.x_Step_by_Step_Migration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
use Joomla\CMS\Component\ComponentHelper;
use Joomla\CMS\Date\Date;
use Joomla\CMS\Event\ActionLog\AfterLogExportEvent;
use Joomla\CMS\Input\Input;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Controller\AdminController;
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
use Joomla\CMS\Router\Route;
use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;
use Joomla\Component\Actionlogs\Administrator\Model\ActionlogsModel;
use Joomla\Input\Input;
use Joomla\Utilities\ArrayHelper;

// phpcs:disable PSR1.Files.SideEffects
Expand All @@ -38,11 +38,11 @@ class ActionlogsController extends AdminController
* Constructor.
*
* @param array $config An optional associative array of configuration settings.
* Recognized key values include 'name', 'default_task', 'model_path', and
* 'view_path' (this list is not meant to be comprehensive).
* Recognized key values include 'name', 'default_task', 'model_path', and
* 'view_path' (this list is not meant to be comprehensive).
* @param ?MVCFactoryInterface $factory The factory.
* @param CMSApplication $app The Application for the dispatcher
* @param Input $input Input
* @param ?CMSApplication $app The Application for the dispatcher
* @param ?Input $input Input
*
* @since 3.9.0
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
use Joomla\CMS\Date\Date;
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Router\Route;
use Joomla\Filesystem\Path;
use Joomla\String\StringHelper;
Expand Down Expand Up @@ -145,26 +144,6 @@ public static function loadTranslationFiles($extension)
$cache[$extension] = true;
}

/**
* Get parameters to be
*
* @param string $context The context of the content
*
* @return mixed An object contains content type parameters, or null if not found
*
* @since 3.9.0
*
* @deprecated 4.3 will be removed in 6.0
* Use the action log config model instead
* Example: Factory::getApplication()->bootComponent('actionlogs')->getMVCFactory()
* ->createModel('ActionlogConfig', 'Administrator')->getLogContentTypeParams($context);
*/
public static function getLogContentTypeParams($context)
{
return Factory::getApplication()->bootComponent('actionlogs')->getMVCFactory()
->createModel('ActionlogConfig', 'Administrator')->getLogContentTypeParams($context);
}

/**
* Get human readable log message for a User Action Log
*
Expand Down Expand Up @@ -232,7 +211,7 @@ public static function getHumanReadableLogMessage($log, $generateLinks = true)
* @param string $contentType
* @param integer $id
* @param string $urlVar
* @param CMSObject $object
* @param \stdClass $object
*
* @return string Link to the content item
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ private function buildDateRange($range)
$dStart->setTime(0, 0, 0);

// Now change the timezone back to UTC.
$tz = new \DateTimeZone('GMT');
$tz = new \DateTimeZone('UTC');
$dStart->setTimezone($tz);
break;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ public function display($tpl = null)
// Load all actionlog plugins language files
ActionlogsHelper::loadActionLogPluginsLanguage();

// Add form control fields
$this->filterForm
->addControlField('task', '')
->addControlField('boxchecked', '0');

parent::display($tpl);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,8 @@
<?php echo $this->pagination->getListFooter(); ?>

<?php endif;?>
<input type="hidden" name="task" value="" />
<input type="hidden" name="boxchecked" value="0" />
<?php echo HTMLHelper::_('form.token'); ?>

<?php echo $this->filterForm->renderControlFields(); ?>
</div>
</form>
<form action="<?php echo Route::_('index.php?option=com_actionlogs&view=actionlogs'); ?>" method="post" name="exportForm" id="exportForm">
Expand Down
Loading
Loading