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.

Sign up for GitHub

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

Jump to bottom

[5.2] Show a warning when there are due tasks #43491

Merged
merged 15 commits into from
Jul 2, 2024
Merged

[5.2] Show a warning when there are due tasks #43491

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
eb4836e
Show next run, show list by next run and show a warning when there ar…
zero-24 May 19, 2024
61b4cfa
Update administrator/components/com_scheduler/src/Model/TasksModel.php
zero-24 May 19, 2024
4c57b86
Update administrator/components/com_scheduler/src/Model/TasksModel.php
zero-24 May 19, 2024
2cc9b52
Update administrator/language/en-GB/com_scheduler.ini
zero-24 May 21, 2024
6efc860
fix default ordering
zero-24 May 22, 2024
1f82a21
Merge branch 'due_tasks' of github.com:zero-24/joomla-cms into due_tasks
zero-24 May 22, 2024
3a55063
Merge branch '5.1-dev' into due_tasks
zero-24 May 22, 2024
b4f4530
Update administrator/language/en-GB/com_scheduler.ini
zero-24 May 23, 2024
4d57455
Merge branch '5.1-dev' into due_tasks
zero-24 May 28, 2024
b381c68
Merge branch '5.2-dev' into due_tasks
zero-24 Jun 9, 2024
7dbe7d3
Dont fix things outside of the scope of this PR
zero-24 Jun 9, 2024
910e8aa
Merge branch '5.2-dev' into due_tasks
zero-24 Jun 13, 2024
c850fd8
Merge branch '5.2-dev' into due_tasks
zero-24 Jun 25, 2024
67a46cd
Merge branch '5.2-dev' into due_tasks
Quy Jun 27, 2024
bc2c1a9
Merge branch '5.2-dev' into due_tasks
pe7er Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch '5.2-dev' into due_tasks
  • Loading branch information
@zero-24
zero-24 committed Jun 9, 2024
commit b381c68b584125eefbc46bf0a1c1d53944fbd7d3
4 changes: 2 additions & 2 deletions administrator/language/en-GB/install.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension client="administrator" type="language" method="upgrade">
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>5.1.2</version>
<creationDate>2024-05</creationDate>
<version>5.2.0</version>
<creationDate>2024-06</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions administrator/language/en-GB/langmetadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<metafile client="administrator">
<name>English (en-GB)</name>
<version>5.1.2</version>
<creationDate>2024-05</creationDate>
<version>5.2.0</version>
<creationDate>2024-06</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions administrator/manifests/files/joomla.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<authorUrl>www.joomla.org</authorUrl>
<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<version>5.1.2-dev</version>
<creationDate>2024-05</creationDate>
<version>5.2.0-alpha2-dev</version>
<creationDate>2024-06</creationDate>
<description>FILES_JOOMLA_XML_DESCRIPTION</description>

<scriptfile>administrator/components/com_admin/script.php</scriptfile>
Expand Down
4 changes: 2 additions & 2 deletions administrator/manifests/packages/pkg_en-GB.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension type="package" method="upgrade">
<name>English (en-GB) Language Pack</name>
<packagename>en-GB</packagename>
<version>5.1.2.1</version>
<creationDate>2024-05</creationDate>
<version>5.2.0.1</version>
<creationDate>2024-06</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions api/language/en-GB/install.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension client="api" type="language" method="upgrade">
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>5.1.2</version>
<creationDate>2024-05</creationDate>
<version>5.2.0</version>
<creationDate>2024-06</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions api/language/en-GB/langmetadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<metafile client="api">
<name>English (en-GB)</name>
<version>5.1.2</version>
<creationDate>2024-05</creationDate>
<version>5.2.0</version>
<creationDate>2024-06</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions installation/language/en-GB/langmetadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<metafile client="installation">
<name>English (United Kingdom)</name>
<version>5.1.2</version>
<creationDate>2024-05</creationDate>
<version>5.2.0</version>
<creationDate>2024-06</creationDate>
<author>Joomla! Project</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
4 changes: 2 additions & 2 deletions language/en-GB/install.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension client="site" type="language" method="upgrade">
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>5.1.2</version>
<creationDate>2024-05</creationDate>
<version>5.2.0</version>
<creationDate>2024-06</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions language/en-GB/langmetadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<metafile client="site">
<name>English (en-GB)</name>
<version>5.1.2</version>
<creationDate>2024-05</creationDate>
<version>5.2.0</version>
<creationDate>2024-06</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
8 changes: 4 additions & 4 deletions libraries/src/Version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ final class Version
* @var integer
* @since 3.8.0
*/
public const PATCH_VERSION = 2;
public const PATCH_VERSION = 0;

/**
* Extra release version info.
Expand All @@ -66,7 +66,7 @@ final class Version
* @var string
* @since 3.8.0
*/
public const EXTRA_VERSION = 'dev';
public const EXTRA_VERSION = 'alpha2-dev';

/**
* Development status.
Expand All @@ -90,15 +90,15 @@ final class Version
* @var string
* @since 3.5
*/
public const RELDATE = '28-May-2024';
public const RELDATE = '3-June-2024';

/**
* Release time.
*
* @var string
* @since 3.5
*/
public const RELTIME = '16:01';
public const RELTIME = '20:06';

/**
* Release timezone.
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "joomla",
"version": "5.1.2",
"version": "5.2.0",
"description": "Joomla CMS",
"license": "GPL-2.0-or-later",
"repository": {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.