29
0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-16 09:02:52 +00:00
Commit Graph

10089 Commits

Author SHA1 Message Date
Benjamin Trenkle
fb8d4e1e13
Merge commit 'd71dcbf4d96e37916c4e12b2e8573f54175086c6' into 4.1-dev
# Conflicts:
#	installation/language/pl-PL/pl-PL.ini
#	installation/language/pl-PL/pl-PL.xml
2022-03-27 01:14:11 +01:00
Roland Dalmulder
77194ec645
Merge branch '4.1-dev' into 4.2-dev
# Conflicts:
#	administrator/language/en-GB/install.xml
#	administrator/language/en-GB/langmetadata.xml
#	administrator/manifests/files/joomla.xml
#	administrator/manifests/packages/pkg_en-GB.xml
#	api/language/en-GB/install.xml
#	api/language/en-GB/langmetadata.xml
#	installation/language/en-GB/langmetadata.xml
#	language/en-GB/install.xml
#	language/en-GB/langmetadata.xml
#	libraries/src/Version.php
2022-03-20 13:50:21 +01:00
joomla-translation-bot
3ef108c966
Translation Update (#37316)
* Language update

* Language update

* Language update

* Language update

* Language update

* Language update
2022-03-19 21:56:56 +01:00
zero-24
d71dcbf4d9
update pl-PL 2022-03-19 00:11:31 +01:00
zero-24
f8b1a9843e
Joomla! 3.10.7 Release Candidate 1 2022-03-18 20:31:54 +01:00
Benjamin Trenkle
78c8ce396e
Bump to 4.1.1-rc1 2022-03-18 20:30:34 +01:00
Tobias Zulauf
b1f0613deb
Switch google fonts off by default for new installs (#36888) 2022-03-17 21:27:58 +01:00
Dimitris Grammatikogiannis
0066aa8a06
[4.1] Fix RTL installation (#37292) 2022-03-17 11:57:27 +00:00
joomla-translation-bot
8f862d6ee3
Translation Update (#37284) 2022-03-16 11:00:49 +01:00
joomla-translation-bot
06ae97f00a
Translation Update (#37043)
* Language update

* Language update

* Language update

* Language update
2022-03-14 05:47:40 +01:00
Roland Dalmulder
46e83707b8
Merge branch '4.1-dev' into 4.2-dev 2022-03-02 19:15:11 +01:00
Richard Fath
136ba34b82
Fix duplicate key for PostgreSQL due to wrong sequence next value (#37154) 2022-02-27 23:24:57 +00:00
Roland Dalmulder
600e3cdf2e
Merge branch '4.1-dev' into 4.2-dev 2022-02-21 08:01:46 +01:00
Benjamin Trenkle
521da1c139
Merge commit 'a624ecff8aa7911680b8c1b071fb3da0d339001e' into 4.1/upmerges/2022-02-20
# Conflicts:
#	administrator/components/com_config/model/form/application.xml
#	administrator/language/en-GB/en-GB.com_admin.ini
#	administrator/language/en-GB/en-GB.com_config.ini
#	htaccess.txt
#	installation/sql/mysql/joomla.sql
#	installation/sql/postgresql/joomla.sql
#	installation/sql/sqlazure/joomla.sql
#	libraries/src/Application/CMSApplication.php
2022-02-20 21:08:24 +01:00
Brian Teeman
a624ecff8a
[3.10] Remove FLoC (#36861)
* [3.10] Remove FLoC

* Update joomla.sql

* Update joomla.sql

* Update joomla.sql
2022-02-20 10:27:14 +01:00
Roland Dalmulder
c40652a13a
Merge branch '4.1-dev' into 4.2-dev
# Conflicts:
#	administrator/language/en-GB/install.xml
#	administrator/language/en-GB/langmetadata.xml
#	administrator/manifests/files/joomla.xml
#	administrator/manifests/packages/pkg_en-GB.xml
#	api/language/en-GB/install.xml
#	api/language/en-GB/langmetadata.xml
#	installation/language/en-GB/langmetadata.xml
#	language/en-GB/install.xml
#	language/en-GB/langmetadata.xml
#	libraries/src/Version.php
2022-02-16 18:47:38 +01:00
Benjamin Trenkle
de15a4085b
Revert to dev 2022-02-15 09:57:17 +01:00
zero-24
eb73d1fa5c
reset to dev 2022-02-12 20:02:01 +01:00
Translation
187596900e Language update 2022-02-10 07:31:23 +00:00
Roland Dalmulder
088188069b
Merge branch '4.1-dev' into 4.2-dev 2022-02-08 18:27:38 +01:00
zero-24
6486e16929
Joomla! 3.10.6 Release Candidate 1 2022-02-06 14:36:34 +01:00
Translation
c3b6dfbbdb Language update 2022-02-06 07:31:05 +00:00
Translation
5f790df157 Merge remote-tracking branch 'upstream/4.1-dev' into translation 2022-02-06 07:30:43 +00:00
Roland Dalmulder
93fd3b61b7
Merge branch '4.1-dev' into 4.2-dev
# Conflicts:
#	README.md
#	README.txt
#	administrator/language/en-GB/install.xml
#	administrator/language/en-GB/langmetadata.xml
#	administrator/manifests/files/joomla.xml
#	administrator/manifests/packages/pkg_en-GB.xml
#	api/language/en-GB/install.xml
#	api/language/en-GB/langmetadata.xml
#	installation/language/en-GB/langmetadata.xml
#	language/en-GB/install.xml
#	language/en-GB/langmetadata.xml
#	libraries/src/Version.php
2022-02-01 20:41:36 +01:00
Translation
1c7ce4d3b0 Language update 2022-02-01 07:31:10 +00:00
Benjamin Trenkle
99560738a3
Bump to RC 2 2022-02-01 02:38:47 +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
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
Roland Dalmulder
f7aacab971
Merge branch '4.1-dev' into 4.2-dev
# Conflicts:
#	.drone.yml
2022-01-30 18:43:55 +01:00
Brian Teeman
24b47ac217
[4.1] s/occurence/occurrence (#36815)
typo
2022-01-25 04:42:35 +01:00
Brian Teeman
63dc79d5d6
[4.1] s/overriden/overridden (#36818)
spelling error
2022-01-25 04:22:39 +01:00
Harald Leithner
541c99fb22 Update version to 4.2-dev 2022-01-23 12:10:17 +01:00
Benjamin Trenkle
f412e13529
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev 2022-01-23 09:15:56 +01:00
joomla-translation-bot
4d40850d89
Translation Update (#36764)
* 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-23 07:18:56 +01:00
wilsonge
8791331f2e
Reset to dev 2022-01-18 07:01:31 +00:00
Benjamin Trenkle
92d7cf3eb8
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into HEAD
# Conflicts:
#	.drone.yml
#	administrator/language/en-GB/install.xml
#	administrator/language/en-GB/langmetadata.xml
#	administrator/manifests/files/joomla.xml
#	administrator/manifests/packages/pkg_en-GB.xml
#	api/components/com_categories/src/Controller/CategoriesController.php
#	api/language/en-GB/install.xml
#	api/language/en-GB/langmetadata.xml
#	composer.lock
#	installation/language/en-GB/langmetadata.xml
#	language/en-GB/install.xml
#	language/en-GB/langmetadata.xml
#	layouts/joomla/content/category_default.php
#	libraries/src/Application/ConsoleApplication.php
#	libraries/src/Version.php
#	tests/Codeception/acceptance/administrator/components/com_media/MediaListCest.php
2022-01-16 03:26:30 +01:00
zero-24
8f96b7ef13
reset to dev 2022-01-15 15:48:50 +01:00
joomla-translation-bot
38e6b07e51
Translation Update (#36645) 2022-01-12 11:41:00 +00:00
Dimitris Grammatikogiannis
1554ad2631
[4.1] Update fix 4.1.0-2021-11-20.sql (#36576)
* Update 4.1.0-2021-11-20.sql

* Update 4.1.0-2021-11-20.sql

* Update 4.1.0-2021-11-20.sql

* Update 4.1.0-2021-11-20.sql

* Fix mail template params also for new installations

* Fix task notification plugin params for new installations, too

* Add new update SQL to fix previous 4.1 beta versions

* Revert "Fix task notification plugin params for new installations, too"

This reverts commit 3b68af5e6b.

* Remove change for extension params from new update SQL

* Revert change of extension params in old update SQL, too

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
2022-01-09 11:51:52 +01:00
Brian Teeman
831c4f1a15
[4.1] @todo (#36612)
Most IDE have tools to quickly find @todo in the code base. This PR corrects the usage of TODO instead of @todo. It will make it easier in future to work through these items, check that they are still valid, and resolve them.
2022-01-09 02:12:24 +01:00
joomla-translation-bot
6c99641942
Translation Update (#36356) 2022-01-08 23:01:44 +00:00
wilsonge
e5246259b7
Tag 4.0.6 RC1 2022-01-08 21:04:54 +00:00
wilsonge
077101026c
Improve security and type checking of the installer task 2022-01-08 19:33:52 +00:00
zero-24
f757534384
Joomla! 3.10.5 Release Candidate 1 2022-01-08 19:53:54 +01:00
Benjamin Trenkle
90ee7905b0
Bump to 4.1.0 Beta 3 2022-01-01 23:05:36 +01:00
Benjamin Trenkle
b7a6aa7610
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev 2022-01-01 11:07:47 +01:00
Richard Fath
9f800fa063
Fix duplicate lft rgt in assets table for PostgreSQL (#36509) 2021-12-31 19:52:38 +00:00
Richard Fath
a407e4abf6
Fix asset table sequence next value for PostgreSQL after upmerge from 4.0-dev (#36507) 2021-12-31 18:18:05 +01:00
Benjamin Trenkle
6dc01f5c49
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
# Conflicts:
#	.drone.yml
#	administrator/components/com_admin/script.php
#	administrator/components/com_content/src/Model/ArticleModel.php
#	administrator/components/com_templates/src/View/Template/HtmlView.php
#	composer.lock
#	installation/sql/mysql/base.sql
#	installation/sql/postgresql/base.sql
#	layouts/plugins/editors/tinymce/field/tinymcebuilder.php
#	package-lock.json
#	package.json
#	tests/Codeception/api.suite.dist.yml
2021-12-31 16:28:26 +01:00
Phil E. Taylor
c604191d6f
[4.0] Remove reference to old JPrefixed Class + Cleanup (Misc) (#36442) 2021-12-30 22:48:10 +00:00
Nicola Galgano
609da7bb69
[4] Add missing asset for "Login Support" module in the installer (#36481) 2021-12-30 12:39:00 +00:00
Konstantin Kolos
5b47ac04e5
[4.0] Input bs5 for installation page (#36464)
* class="form-check-input"

* tabs
2021-12-29 08:13:17 -08:00
Brian Teeman
1a32b68ae9
[4.1] Joomla-Accessibility Checker (jooa11y). (#36190)
* jooa11y scaffolding

media folder
web assets
     hard coded until we decide on npm or not

to install check out this branch
npm run build:js
npm run build:css
discover install the plugin

todo - aka brian needs help
[] make the checker start
[] make the checker use the settings from the plugin

* script loads now

* tippy - temp

* editor button

* toolbar

* enpugh

* Jooa11y/enhancements (#132)

* Add some enhancements

* Fix wrong name

Co-authored-by: Benjamin Trenkle <benjamin.trenkle@wicked-software.de>

* tabs

* tippy popper licence and naming

* postgresql install

* xml bug

* cleaning

* tidy

* fix

* dont need scss

* needs to be an integer

* deploy version

* might not be the best way?

* Revert "Auxiliary commit to revert individual files from 18199dd5bec43f5b52bfcfd1b0bb13afb865dc2c"

This reverts commit 4eb15800ccc4bb0d64580013b58a92505bc5abfc.

* clarify show

* options

* package.lock

* remove editor button

* cs

* string

* set input

* deploy

* Temporary add git to node ci (#133)

* github link

* param

* Revert "param"

This reverts commit 378a64e0a3.

* params

* spelling

* revert

* sql field

* cs and spelling

* Fix npm

* Revert drone.yml change

* Switch package to tarball

* Use the es module

* Update eslint-plugin-vue to 8.2.0

* CS (#135)

* lang

* progress update

* fix strings

* load strings

* js change from @fedik

* typo and package-lock

* sef and non-sef

* revert change by Dimitris

* Update joomla-a11y-checker version

* Update joomla-a11y-checker version

* Update view preview url

* simplify

* Update jooa11y.php

* fix jscs (#136)

* undo eslint change

* remove "Additional ruleset toggles" from the plugin settings

* Update .eslintrc

lets try this again

* final try

* sha

Co-authored-by: Benjamin Trenkle <benjamin.trenkle@wicked-software.de>
Co-authored-by: Harald Leithner <leithner@itronic.at>
Co-authored-by: dgrammatiko <d.grammatiko@gmail.com>
Co-authored-by: Dimitris Grammatikogiannis <dg@dgrammatiko.dev>
Co-authored-by: Benjamin Trenkle <bembelimen@users.noreply.github.com>
Co-authored-by: Fedir Zinchuk <getthesite@gmail.com>
2021-12-29 10:39:29 +01:00
Phil E. Taylor
accbe4ef12
Return value type is not compatible with declared (#36412) 2021-12-29 01:19:11 +00:00
Benjamin Trenkle
39807a496d
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
# Conflicts:
#	.drone.yml
#	administrator/language/en-GB/install.xml
#	administrator/language/en-GB/langmetadata.xml
#	administrator/manifests/files/joomla.xml
#	administrator/manifests/packages/pkg_en-GB.xml
#	api/language/en-GB/install.xml
#	api/language/en-GB/langmetadata.xml
#	installation/language/en-GB/langmetadata.xml
#	language/en-GB/install.xml
#	language/en-GB/langmetadata.xml
#	libraries/src/Version.php
2021-12-18 15:27:04 +01:00
joomla-translation-bot
9d50af62da
Translation Update (#36325) 2021-12-16 23:12:17 +00:00
wilsonge
92e67d80c6
Reset to dev 2021-12-13 23:32:17 +00:00
zero-24
d55ab7f9dd
reset to dev 2021-12-11 16:15:22 +01:00
zero-24
76e6589a55
Joomla! 3.10.4 Stable 2021-12-11 16:06:07 +01:00
joomla-translation-bot
bfaf931341
Translation Update (#36258) 2021-12-08 18:36:49 +00:00
Thomas Hunziker
bd2ff20043
[3.10] Installation languages for ru-RU, it-IT and sk-SK (#36223)
* Installation languages for ru-RU

* Added it-IT and sk-SK

* Update installation/language/sk-SK/sk-SK.xml

Co-authored-by: Thomas Hunziker <werbemails@bakual.ch>
Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com>
2021-12-07 19:51:39 +01:00
Benjamin Trenkle
bfd66d9442
Bump to 4.1-beta1 2021-12-07 15:59:21 +01:00
Benjamin Trenkle
4dc16a86e5
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
# Conflicts:
#	administrator/manifests/files/joomla.xml
#	libraries/src/Version.php
2021-12-07 11:39:11 +01:00
joomla-translation-bot
328c3eba86
Translation Update (#36226) 2021-12-06 22:09:28 +00:00
wilsonge
ceacd3536e
Fix version in reset to dev 2021-12-05 18:31:30 +00:00
wilsonge
af3386d2b7
Reset to dev 2021-12-05 18:30:40 +00:00
Benjamin Trenkle
da1f63343d
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
# Conflicts:
#	administrator/language/en-GB/install.xml
#	administrator/language/en-GB/langmetadata.xml
#	administrator/manifests/files/joomla.xml
#	administrator/manifests/packages/pkg_en-GB.xml
#	api/language/en-GB/install.xml
#	api/language/en-GB/langmetadata.xml
#	installation/language/en-GB/langmetadata.xml
#	language/en-GB/install.xml
#	language/en-GB/langmetadata.xml
#	libraries/src/Version.php
2021-12-05 19:19:48 +01:00
wilsonge
ac67ec3735
Tag RC2 2021-12-05 18:07:27 +00:00
joomla-translation-bot
39f052dc46
Language update (#36220) 2021-12-05 17:49:11 +00:00
Thomas Hunziker
cbde13f15b
[3.10.4] Updated installation language files (#36158)
* Updated installation language files

* da-* updates

* Adjusting header of da-DK.ini to be inline with en-GB.ini

* Update installation/language/cy-GB/cy-GB.xml

Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com>

* Update installation/language/hr-HR/hr-HR.xml

Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com>

* Update installation/language/fr-FR/fr-FR.xml

Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com>

* Update installation/language/nb-NO/nb-NO.xml

Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com>

* Added languages

* Adding sv-SE

* Added fa-IR

* Added ja-JP and es-ES

* Escaping quotes in es-ES

* Reformat ja-JP XML

Co-authored-by: Thomas Hunziker <werbemails@bakual.ch>
Co-authored-by: zero-24 <zero-24@users.noreply.github.com>
2021-12-05 18:06:11 +01:00
Dimitris Grammatikogiannis
579e20ee14
4.1 Child templates 1/2 (#35874)
* New mode for cassiopeia and atum

* DB Changes

* Fix wrong import paths

* SQL for updates

* Deleted files and folder for changing core templates to inheritable

* Better version comments

* Move custom files in core templates to media folder on update

* Better English in the comment

* Fix some paths

* System templates

* Deleted files and folders for system templates

* Move template preview files, too

* Create parent folders if necessary at target path

* Don't delete template previews

* Revert special handling for core template preview images

* move images to the correct folder

* Fix the logos

* One more path fixed

* Revert the tinyMCE changes here

* Fix the roboto path

* Fix the fontawesome path

* .css files imports are relative to the path of the file importing

* Add missing import

* Use realpath instaed of the Path::clean

* RecursiveDirectoryIterator && mkdir

* Meh

* Mehhh

* Update administrator/components/com_admin/script.php

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

* No dots and dirs

* Use the flag for the dots

* Update administrator/components/com_admin/script.php

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

* sql

* Cassiopeia Roboto

* Update paths to local font schemes in template style parameters on database update

* Roboto font path

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: Benjamin Trenkle <bembelimen@users.noreply.github.com>
2021-11-30 03:34:47 +01:00
wilsonge
eabccde4b4
Tag 4.0.5 RC 2021-11-28 18:41:05 +00:00
zero-24
500472bf3a
Joomla! 3.10.4 Release Candidate 1 2021-11-28 19:34:12 +01:00
Tushar
3be67ab042
[4.1] [SOC 21] Add a Scheduled Tasks Infrastructure to Joomla (#35143)
* Fix task filter ordering

Order now matches the order of columns the db table.

Ref: joomla/joomla-cms#35143#discussion_r700213211 / @brianteeman.

* Improve com_scheduler language strings

Improves a task form hint, a label.

Refs: joomla/joomla-cms#35143#discussion_r700203125
      joomla/joomla-cms#35143#discussion_r700202862
      @brianteeman.

* Scheduler runner as a shutdown_function

The schedule runner trigger is now bound as a shutdown_function.
The function is registered by a onBeforeRender listener.

* Enhance task locks and events

- Updates task locks (the `locked` column) so they now use a timestamp
  to allow for recovery from a fatal failure. Includes updates to SQL
  scripts.
- Dispatch a new onTaskRecoverFailure event on "recovery" from a fatal
  failure.
- Actually dispatch task exit events (oops!)
- Update the event class declaration for onExecuteTask to be more
  elegant, readable. [1]

[1]: http://joomla/joomla-cms#35143#discussion_r700897628 / @Denitz

* Add a sanity check to TaskPluginTrait

Adds a pre-broadcast sanity check for plugins with invalid an TASK_MAP.
The advertiseRoutines method will no longer try to advertise tasks that
don't have a corresponding 'langConstPrefix'.

* Fix fatal task failure check

Fixes the failure check (the lock should not be null) and
enhances a comment + styling.

* Increase scheduler plugin hook priority

Increases the priority for the registerRunner hook to PHP_INT_MAX,
although I'm not yet sure if onBeforeRender is the first event to be
fired (probably not).

* Fix event dispatchers in the Task class

The onTaskRecoverFailure and exit task weren't passing the
event name to dispatchers. Oops!
P.S. I don't know why that's required with the new Event classes.

* Cleanup com_scheduler manifest

Removes menu link (was supposed to go before).

* Add filtering by lock state in TasksModel

Adds support for filtering by the "lock" state of a task. Also in
the process defines different lock levels: hard locks and soft locks.
I think in the future, the filtering states should maybe
go into a namespace/class for constants.

* Add task timeout config to "com_scheduler"

Adds a configuration field for a global task timeout.
The timeout serves the purpose of safely declaring a hard-limit on how
long tasks can be considered as running once a lock on them is acquired.
Right now the default is 300s (5min) but this can be re-evaluated
in the future to a more sensible value if needed.

* Update language file for "com_scheduler"

Adds new constants for the component configuration form.

* Bugfix and update Scheduler API class

- Now fetches all fields from the DB (this broke things as the `locked`
  field was never fetched!!)
- Adds locked state filtering as a default (excludes hard-locked jobs).

* Add priority column to `#__scheduler_tasks`

- Adds a priority column to the tasks table, also a linked index.
- Fixes update SQL script styling.

* Add task priority to Task form and filter form

* Add priority, multi-ordering support to TasksModel

- Adds priority to the filter_fields config.
- Adds support for a `list.multi_ordering` model state variable which
  can be used to sort by multiple fields (limitation for the standard
  `list.ordering` `list.direction` model). The way this is right now
  means we pass unquoted names to the db which should be fixed in the
  future. In any case this is not exposed in the filter form but only
  meant to be used by internal handlers interacting with the model.
- Fixes behaviour for high collision ordering fields (used to order
  first by title and then by the targeted column).

* Update task timeout with config fetch

The Task driver class now fetches the task timeout from the component
config.

* Add priority-aware task queue to Scheduler class

The fetchTasks() method now uses multi-ordering with priority as the
primary ordering column to make the task queue priority aware.

* Update language files for com_scheduler

- Adds language constants for the task priority config in the task and
  tasks filter form.
- Sneaks in a description attribute for the priority form field.

* Bugfix and add an 'Advanced' tab to the task form

- Moves the log config and task priority to the advanced tab.
- Fixes a bug with using `joomla.edit.params`, which is now used
  for rendering all injected task routine parameters.

* Enhance orphan task handling in Task driver

- Dispatches now an event if task to run is orphaned, then skip the
  execution and exit early with a new exit code.
- Adds a skipExecution method to the Task class.
- Enhanced the handleExit method through an events map to dispatch
  other events based on exit code.
- Adds a new code for orphaned tasks to the Status namespace class.

* Enhance orphan handling in Scheduler, update lang

- Scheduler now includes orphaned tasks by default. Before this,
  the ::runTask() method never got to handling or logging orphaned
  tasks because of the default filtering excluding them.
- Adds exceptional log for orphaned tasks.
- Update language file to match.

* Add demo task routines to stress memory

Adds task routines to test scheduled tasks when either the system memory
runs out or the PHP memory_limit is exceeded.

* Add sleep demo task routine

Renames the first demo task routine and adds a form field to configure
the sleep duration.

* Update language files for plgTaskDemotasks

Adds constants for new task routines and updates some others.

* Cleanup and bugfix com_scheduler

- Removes redundant pass-by-reference
- Makes closures static where possible
- Fixes problematic casts
- Adds some missing parenthesis
- Removes unused variables
- Removes unused method overrides
- Miscellaneous changes

Ref: joomla/joomla-cms#35143 / @Denitz

* Improve consistency, extend `#__scheduler_tasks`

Adds `checked_out` and `checkout_out_time` to `#__scheduler_tasks`. Also
adds index for `checked_out`.

Ref: joomla/joomla-cms#35143#issuecomment-911819994 / @Denitz

* Remove language autoload from ScheduleRunner

Ref: joomla/joomla-cms#35143#issuecomment-911819994 / @Denitz

* Fix missed errant cast

Fixes a leftover problematic cast in IntervalField.

* Patch Task::releaseLock()

The method now updates the Task properties, so they now keep in sync
with db updates and can be used reliably by other code.

* Add plgSystemTaskNotification

This plugin is responsible for sending out email notifications for
task failures and optionally also successful executions.

* Add language files for plgSystemTaskNotifications

* Add SQL DDL for task notification mail templates

* Add auto-install SQL (plgSystemTaskNotifications)

* Add language autoload for plgSysTaskNotification

* Patch auto-install SQL scripts

- Adds installation DDL in installation script (supports.sql)
- Adds the `extension` column in update scripts.

* Cleanup plg taskNotification

* Fix Scheduler::fetchTasks() default behaviour

Shifts the list config for the task queue to the fetchTaskRecord()
method. This makes more sense as the fetchTasks() method is supposed
to be a transparent API method to interact with the TasksModel rather
than have an overriding default like the list.multi_ordering state
variable as a default. Also changes the default ordering behaviour for
sensibility and adds some comments for clarity.

* Add explicit id, title filtering to TasksModel

These are largely redundant to the search filter but convenient to use
and when only the title should be targeted. It turned out I assumed
we had this in the model and so was an outstanding bug with the
Scheduler class. Probably, can use refactor later (or _should_).

* Enhance ExecRuleHelper::nextExec()

Adds a new option $nowBasis argument, when provided uses 'now' as the
last execution. Useful when skipping executions, so we're not actually
updating the last exec.

* Add new Task::Status constant

Adds a status code for when no (matching) task exists.

* Improve comments in the TaskOption class

Improves comment structure, adds some missing punctuation.

* Update the Scheduler class

- Renames fetchTasks() => fetchTaskRecords().
- Fixes broken id search (l190).
- Updates runTask() return (now returns the Task exit code).
- Adds TASK_QUEUE filters and list config as class constants so other
  extensions can reliably use them to get the queue behaviour (should
  this somehow be baked in?).
- Updates return for fetchTaskRecords(), which could return a false
  from the model query before but now would an empty array.

* Bugfix Task::skipExecution()

Now actually skips the execution and advances the task to the next
execution slot relative to 'now'.

* Add scheduler:list console command

Command to list scheduled tasks.

* Add scheduler:run command

Command to run scheduled tasks. Supports triggering the task queue
as well as individual tasks, matching either by id or title. Right now,
due some code-smell fixes and perhaps behavior adjustments. An example,
perhaps the title match could support running all tasks matching a title
with the --all flag.

* Add autoload for new commands

Adds new commands to the application loader and dependency injection
class used by other core commands.

* Add plugin plgTaskCheckFiles

Adds plgTaskCheckFiles. This plugin includes currently a single task
routine which offers the ability to check images in a directory
for dimensions and resize ones that are too big!

* Enhance form for image size routine

Adds sensible defaults, require attributes, etc.

* Update form for get_request routine

Updates the fieldset so its translated right.

* Update language file for com_scheduler

Adds a new constant for the task_params fieldset so plugins can use it
without defining their own.

* Patch task form

Patches the "trigger" field to make it hidden. This is temporary as it
should be removed altogether soon both in the form and the db table.

* Patch exit handling in Task class

The handleExit() method needed the exit code to be passed while it was
available already in the $snapshot class property. This also created
room for error and the final handleExit() return meant that generic
failures were never broadcasted through the failure event.

* Patch exit handling in Task class

The handleExit() method needed the exit code to be passed while it was
available already in the $snapshot class property. This also created
room for error and the final handleExit() return meant that generic
failures were never broadcasted through the failure event.

* Add support for mailing task outputs

Implements support for mailing out task output attachments and
in the body. Not robust but just works for a demo (needs to be
redone).

* Update SQL for task notification templates

Adds the "task_output" param.

* Add output file support in GET request routine

Hastily done and to be redone but this works okay as a POC.

* Patch task class

Fixes the execution time record/next execution which broke somewhere
along before. This is a quick patch and should be fixed as suggested
by the comment.

* Disable deprecated routineEndMessage [CheckFiles]

* Improve code quality, consistency and style

- Removes some redundant comments.
- Reduces reliance on implicit PHP casts.
- Refactors to a more functional approach in TaskModel::save() and calls
  nested within.
- Uses allowed Priority::MAX as plgSystemSchedulerunner listener
  priority.
- Refactors some abbreviated variable names.
- Changes uses of the 'GMT' to 'UTC' (more correct and consistent with
  existing Joomla code)
- Separates some variable assignments and tests for improved
  readability.
- Starts removing imports for native global functions and objects.
  This should be a gradual process.
- Cover up a couple copy-and-paste inconsistencies. oops!
- Reverts a styling regression in old code.

Ref: joomla/joomla-cms#35143 / @nibra / @HLeithner / @brianteeman.

* Make SchedulerHelper abstract

Makes SchedulerHelper an abstract class. This also eliminates the need
for a private constructor.

Refs: joomla/joomla-cms/#35143#discussion_r710998565
     / joomla/joomla-cms#35143#discussion_r710999157
     / @PhilETaylor
     / @nibra.

* Add request hash protection for scheduler runner

- Adds a configuration tab for the lazy scheduler in ComScheduler with
  configuration switches for disabling the lazy scheduler and protecting
  it with a request hash.
- Adds configuration checks in plgSystemScheduleRunner to only run if
  either hash matches or it's not protected.

* Bugfix scheduleRunner event subscription behaviour

ScheduleRunner attached itself to events even with comScheduler
disabled. This was likely because it utilised a constructor short which
is useful only with the pre-4.x event-method model.
This commit adds checks for the component straight to the
getSubscribedEvents() method and also adds a check for the lazy
scheduler switch in com_scheduler config params.

Refs: @Denitz / joomla/joomla-cms#35143#issuecomment-911453500.

* Add rule for manual-only task invocation

Adds an execution rule for when a task should only run when manually
invoked. Also renames internally the "custom" rule to "cron-expression".

* Refactor and extend TaskModel, TaskTable

- Updates TaskModel for changes in the Task form.
- Extends and refactors TaskModel to both support to both support
  the new manual invocation only rule and for better behaviour with
  setting some fields initially in the database.
- Adds a Task::bind() override to TaskTable and changes a default
  param to support updating fields to NULL through AdminModel::save().

* Update ExecRuleHelper

- Update with changes to the Task form.
- Removes imports for native global functions.

* Update language constants for com_scheduler

- Adds language constants for new Scheduler config fields.
- Refactors some language constants for better, more uniform naming.

* Cleanup Task class

- Removes outdated info from handleExit() PHP-doc.
- Removes imports for native global symbols.

* Update com_scheduler manifest

- Adds some missing fields and fixes code-style.

* Apply code-style suggestions from code review

- Fixes styling for some docblocks.
- Fixes copyright header alignment for consistency (non-exhaustive).
- Adds trailing commas for multi-line array declarations (probably non-exhaustive).
- Adds explicit name-spacing for global native symbols (likely non-exhaustive).
- Misc code-style improvements.

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

* Apply code-style suggestions from code review

- Fixes styling for some docblocks.
- Fixes copyright header alignment for consistency (non-exhaustive).
- Adds trailing commas for multi-line array declarations (probably non-exhaustive).
- Adds explicit name-spacing for global native symbols (likely non-exhaustive).
- Misc code-style improvements.

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

* Clean up usage

* Add AJAX requests script to scheduleRunner

JS sets up a navigator.sendBeacon() callback to make
requests to trigger a `com_ajax` backed AJAX listener offered by
plgSystemScheduleRunner.

* Update manifest for plgSystemScheduleRunner

Adds the new media asset folder, fills in some missing fields and
fixes the language field.

* Add scheduleRunner listener to inject JS

- Removes `shutdown_function` behavior to register the scheduleRunner.
- Adds listener method to inject the trigger JS on the
  `onBeforeCompileHead` event.
- Fixes copyright header styling.
- Reduces event subscription stage check complexity. (Ref: @Denitz /
  joomla-projects/soc21_website-cronjob#4#commitcomment-57308547)
- Adds `com_scheduler` component config as class property.
- Change scheduleRunner's subscription event to `onAjaxRunScheduler`.

* Add scheduleRunner doc and missing checks

- Adds descriptive doc in the class docblock.
- Adds missing checks to the runScheduler() method.

* Fix `created_by` auto set on task save

- TaskTable::save() now sets the `created_by` field  correctly.
- Adds and fixes existing checks for field auto-set.

* Cleanup and enhance TaskTable docs

- Fix copyright style.
- Enhance doc blocks.
- Cleanup.

* Fix plugin manifests

- Lowercase <name>.
- Adds missing fields and missing <files> nodes.
- Fixes XML styling (tasknotification.xml)

Ref: @bembelimen

* Revert changes to the modules/select template

Reverts file to 4.1-dev state.

* Add standard routine handler

`standardRoutineHandler()` can take care of initialising the routine,
calling the associated callable and ending the routine all without
any logic in the plugin class if each routine has a corresponding
callable.

* Fix copyright formatting

* Update Task\Status

Adds status code for invalid return and improves member doc blocks.

* Refactor TaskPluginTrait

- Renames methods:
 - `taskLog()` => `logTask()`
 - `taskEnd()` => `endRoutine()`
 - `taskStart()` => `initRoutine()`
- Upgrade `enhanceTaskItemForm()` to a complete event handler. For
  plugins targeting only the task form, this method can now be mapped
  straight to the `onContentPrepareForm` event.
- Code style improvements and fixes for global namespace qualification
  on some `\Exception` references.
- More explicit checks on variables.
- `Event` type arguments are now `EventInterface` so other
  implementations stay compatible.
- Removes deprecated logging nd `$log` param from `endRoutine()`.

* Improve TaskPluginTrait documentation

Adds and improves on the information in the doc blocks with context,
usage hints and related information. Also updates some parameter
information and fixes the tag order (`@since` <=> `@throws`).

* Implement suggestions on TaskPluginTrait

- Refactors `initRoutine()` => `startRoutine()`
- Return true for irrelevant enhanceTaskItemForm() contexts.
- Path checks for routine forms.
- Allow only class methods with `standardRoutineHandler()`
- Adds signature checks on standard routine methods.
- Adds validation on routine return codes against `Task\Status`.

* Update TaskPluginTrait::standardRoutineHandler()

Now enforces a single required parameter of type `ExecuteTaskEvent`
(from `EventInterface`).

* Update task plugins

- Remove methods now offered by TaskPluginTrait.
- The 'call' TASKS_MAP param is now 'method'.
- Update event subscriptions.
- Update docs.
- Improve code-style and copyright blocks.

* Ignore user aborts on scheduler trigger

Adds attempt to set the INI `ignore_user_abort` to true.
Also enhances some docs.

* Update TaskPluginTrait doc

Updates signature reference for standard routine methods.

* Rename status code

Renames `Task\Status::NO_TIME` to `Task\Status::RUNNING`.

* Add config options for scheduleRunner

Adds config option for the client side request intervals
for the scheduler trigger. Also fixes some showon attributes in
the com_scheduler config form.

* Add removal of time limit on task runs
Add test task permission
Add webcron, test task, lazycron entry points

* Fix broken interval run when setting custom value

* Set correct lazyCron URL and run it at the beginning
Prevent running LazyCron when not in html view or if lazyCron is not enabled
Implement hash check for webCron

* Rebuild JS
Implement test runner

* Finish test cron

* Fix CS

* Revert SQL query

* Add webcron to scheduler config

Updates the `com_scheduler` config.xml with the webcron fieldset.

* Add webcron key autogen and more to Schedulerunner

- Schedulerunner auto-generates the webcron key and does some form
  usability enhancements on the config form (much like the user API
  token plugin).

* Add custom field for webcron link

- Adds new field 'WebcronLinkField', this field is not really needed
  except for to support the custom layout location.
- Allows for the webcron link to be copies on click, much like the user
  API token field.
- Adds field JS to the `com_scheduler` media source provider.

* Update com_scheduler language file

Adds new strings for the config form and updates some refs.

* Fix regression in Scheduler class

- Fix regression due to newly protected status
  of Task::snapshot + accessor.
- Update some doc-blocks and related formatting.
- Optimise some imports.
- Minor miscellaneous changes.

* Fix test run JS

Fixes apparent JS parse error on non-zero task exits.

* Improve form manipulation code

- Check for `com_scheduler` in the subject table for table event.
- Minor code simplification.

* Clean up redundant field from Tasks table

- Remove redundant `trigger` field from `#__scheduler_tasks`.
  - From install and update SQL.
  - Task item form.
  - Language file.
- Fix regression in GenericDataException ref.
- Minor styling/doc fixes and upgrades.

* Remove global task configuration config

- Removes task configuration config from `plgSystemTasknotifications`
  plugin config.
- ! Does not update any usages.

* Add task notification config as injected form

- Task notification config is now injected into the task item form.
- ! Usages are not updated.

* Improve plgSystemTaskNotification code style

- Updates docs.
- Improves docblocks, general code style for compliance with unenforced
  Joomla! style guide.

* Fix params display in task view

* Add fieldset labels for task form

- Adds missing fieldset labels.
- Adds some comments and fixes marginally code-style.

* Update task notification logic

- Replaces checks with updated task item configuration.
- Improves logging (additional checks).
- Makes file attachment handling safer.
- Fixes/updates code-style.

* Update plgSystemTaskNotification language file

- Adds new constants for logging.
- Fixes ordering.

* Fix Task driver behavior

The run() method now updates the object state instead of leaving it
to releaseLock(). The class continues to appear a clunky build :D.

* Fix TasksRunCommand regression

* Fix scheduleRunner default behaviour

- Uses again sensible defaults (enabled lazy cron).
- Check webcron.enabled.
- Some useful logging.
- Improved docblocks.

* Update scheduleRunner language files

Adds new constant for a logging string.

* Update and fix code-style

- Fix license header formatting.
- Fix doc phpdoc tag ordering.
- Cleanup and marginally improve doc-blocks.
- Fix unqualified global refs in doc-blocks.
- Misc formatting fixes/improvements.
- Remove phpcs ignores.

* Revert drone

* Update com_scheduler language file

- Missing constant.
- Ordering.

* Apply suggestions from code review

Code-style and language improvements.

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

* Apply suggestions from code review

Code-style and language improvements.

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

* Update language constants for plgSysScheduleRunner

Updates plugin description string.

* Bugfix Task::run()

For some reason, the UNIX timestamp with microseconds `microtime()`
broke the DateTime breaking down the task usual scheduling.
This commit introduces an int cast for the timestamp which makes things
work as expected.

* Fix webcron url & description

Fixes webcron url and description as exposed in the Scheduler component
config.

Ref: joomla-projects/soc21_website-cronjob#37

* Update joomla.asset.json

* Improve the locking mechanism

* Add table locking when locking task

* CS

* Simplify null date check

* Add column quote

* Extend TaskModel's getter method

! Fails in MySQL 5.6 with "Table <task table> was not locked with LOCK
  TABLES"

- Adds options array to customise behavior.
- Adds static option resolver for proxies to the getter.
- Wrap queue behavior in a sub-query for compatibility.
...

* Update Scheduler::getTask() and runTask()

Updates Scheduler::getTask() and Scheduler::runTask() to match
the updated TaskModel::getTask() method.

* Fix typos and improve static analysis support

Fixes some typos and adds some doc IDE typehint for improved
static analysis to the Scheduler class.

* Update/fix Schedulerunner

Updates primarily the Schedulerunner::runTestCron() method. Other
methods might need to be updated still.

* Update Task class

Minor updates, comments for the future.

* Update Task::releaseLock()

Fixes compatibility with PostgreSQL (tested on 11). Removes table
specificity from columns (this confuses Postgres for some reason).

* Update TaskModel::getTask()

Fixes task queue behavior (now only applies when an ID is not passed).

* Improve TaskModel::getTask() mysql compat

! Still fails because of table locks
- Adds pseudo-source for sub-query.
  https://stackoverflow.com/q/44970574
- Adds reference comments to try to make the
  SQL gymnastics make sense.

* Add unlock function

* Fix language strings for the schedulerunner plugin

* Update description and remove plugin files

* Implement Scheduler CLI state changer

* Update TasksStateCommand.php

* Fix list state filter in scheduler

* Fix MySQL lock violations

Fixes lock violation by getting rid of sub-queries.

* Fix label a11y [#42]

* Quote 'id'

Co-authored-by: Benjamin Trenkle <bembelimen@users.noreply.github.com>

* update publish/unpublish => enable/disable

* Add check for checked out tasks

Adds check for checked out state of tasks, so it doesn't silently fail
anymore if such a task is attempted to be updated.

* Improve static analysis support.

Adds type hints for classes so static analysis and IDE autocomplete
works better.

* Update exit codes and fix typos

- Updates failure exit codes so all are now distinct.
- Fixes typos and other minor things.
- Uses syntactic string composition instead of concatenation.

* Cleanup

Removes debug string eval

* Fix SQL scripts

Reduces length of `#__scheduler_tasks.type` to evade exceeding maximum
length of indices and considering 128 chars is sufficient for a UUID
and for context aware string currently used for routine IDs.

Refs: @HLeithner

* Apply Code-style and doc-block improvements from code review

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

* Replace Registry inheritance with composition

Task no longer extends Registry, but uses a new `taskRegistry` property
to store a Registry object. This compositional pattern makes the code
stink less.

* Refactor Task::isSuccess()

No longer takes care of dispatching exit events, which is done by
Task::dispatchExitEvent() now. Return API is unchanged.

* Apply Code-style and doc-block improvements from code review

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

* Update doc-blocks for the Task driver

Adds doc-block for Task::EVENTS_MAP and updates the constructor's.

* Update composer.lock

* Update composer.lock

* Make Task property getter public [bug]

Makes the task property getter public. Protected visibility here
breaks things.

* Improve task routine exception handling

- The driver now allows for and preserves exceptions from routines,
throwing them again after wrapping things up and releasing the task
lock.
- Removes the nonNull assertion for the routine snapshot (this already
  did not work).

* Update plgScheduleRunner

Webcron now throws the exception from the task, if it exists. This is
caught by com_ajax and the exception message included in the output.

* Update Task::Status

Renames the KO_RUN status to KNOCKOUT, adds description in docblock.

* Fix exception handling in TaskPluginTrait

Catches only ReflectionExceptions now, leaving out others for the Task
driver to access.

* Cleanup assert exception refs

Cleans up imports and docblocks.

* Improve ScheduleRunner documentation.

* Improve code style

Majorly fixes from the latest updates in Joomla's PHP CS Fixer config,

* Fix demo task form

* Update language file for `com_scheduler`

* Use output buffering for lazyCron to avoid dying

* Merge update SQL

* Update plgTaskCheckfiles

- Adds support for WEBP.
- Better format support while resizing.
- Minor refactoring and more informative logging.

* Update scheduleRunner docs

* Improve code quality for task unlocking

- Improved static analysis support and type-hinting.
- Fix usage of undefined variables.
- Add/modify comments and variable names.
- Update event names and interface for relevance.
- Improve docs in doc-blocks.
- Fix code-style.

* Fix com_scheduler, task plugin code-style

Fixes code-style with the updated php-cs-fixer config.

* Fix WebcronLinkField::getLayoutPaths()

The union operator... did not do the right job.

* Merge more update SQL

Missed one!

* Rename update SQL

Updates date signatures of update files to a fresher date.

* Make plgTaskCheckfiles logging translatable

Adds language constants for logging strings.

Refs: @PhilETaylor

* Update plgTaskRequests

- Add logging on exception.
- Improve variable naming/file write safety.
- Update language file.

Refs: @PhilETaylor

* Improve exception handling plgTaskCheckfiles

- Improves handling exceptions and failures.
- Adds more informative logging.

Refs: @PhilETaylor

* Update code-style and language

- Fixes some misc code-style, reverses regression.
- Adds language for some log.

* Fix installation and update SQL scripts

* Fix update SQL for PostgreSQL for the database checker

* Add new core extensions to the extensions helper

* Add auto-install SQL for plg_task_checkfiles

- Adds auto-install SQL for both installation and update.
- Also adds relevant entry to ExtensionHelper.

Refs: joomla-projects/soc21_website-cronjob#49 / @richard67

* Add DB column for cli exclusive tasks

- Adds new DB column `#__scheduler_tasks.cli_exclusive`, updating both
  install and update scripts. Also adds relevant index.

* Add support for CLI exclusive tasks

- Updates TaskModel::getTask() with an option to include/exclude
  CLI exclusives.
- Adds runtime check to Scheduler::runTask() so it now includes CLI
  exclusives only in a CLI context.

* Add comments, fix doc signatures + style

- Add comments to schedulerunner.
- Fix some type signatures in doc-blocks.
- Other minor style fixes.

* Fix get request response body

Shouldn't throw an undefined constant again.

* Add `Scheduler::run()` option for concurrency

- Scheduler::run() now uses an options array backed by the Symfony
  OptionsResolver.
- Offers a new option that allows for execution concurrency (this was
  specifically required by the CLI command).

* Update plgSystemSchedulerunner

Updates Schedulerunner for changes in Scheduler::run()

* Make `scheduler:run` safer

- Null safety against Tasks.
- More informative stderr log on lock acquisition failures.
- Now allows concurrency so Web doesn't block out CLI anymore (thanks
  to the updates in Scheduler::run()).

Refs: joomla/joomla-cms#35143#issuecomment-976391914
      / @alikon
      / @bembelimen

* Refactor `scheduler:state`

- Better (expectedly safer) flow of logic with attempts to get the
  logical/enumerated state from command mode and interactive modes.
- Terminate on invalid command invocation.
- Fix exit success message (did not show action).
- Better formatting of description, etc.
- Code-style fixes.

Refs: joomla/joomla-cms#35143#issuecomment-977608144
      / @alikon
      / @bembelimen

* Improve `scheduler:run` description style

Minor improvement to `scheduler:run` description for consistency.

* Add utilities, bugfix Task class

- Adds state enumerations and map.
- Adds basic static state and id validators.
- Fix use of un-imported Text class, $->getMessage() call.

* Improve `scheduler:state` command

- Better validation and improved consistency.
- Removes now redundant state enumerations, mapping and validators
  which the Task class offers.

* Add page reload after testing

* Code sniffer fixes

* Rename param for Scheduler::fetchTaskRecord()

Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>
Co-authored-by: Benjamin Trenkle <benjamin.trenkle@wicked-software.de>
Co-authored-by: Brian Teeman <brian@teeman.net>
Co-authored-by: Benjamin Trenkle <bembelimen@users.noreply.github.com>
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
2021-11-26 12:42:10 +01:00
Benjamin Trenkle
16f3dc1b33
Merge branch '4.1-dev' of github.com:joomla/joomla-cms into 4.1-dev 2021-11-23 21:20:59 +01:00
Allon Moritz
379895ccd9
[4.1] Media webservice (#35788)
* [4.0] Notification icons (#34226)

* remove method allow parent to run (#34118)

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

* [4.0] Changing title to tooltip for template preview (#33292)

* [4.0] Changing title to tooltip fpr template preview

* Update location path in description (#34238)

* Fix patterns field check when field empty and not required (#34124)

* [4.0] Finish transition from CSS classes "label-" to "alert-" for the pre-update check (#34227)

* [4.0] mod_popular with disabled hits (#34257)

* [4.0] mod_popular with disabled hits

When hits are disabled for articles it makes no sense to display the Most Read Articles module in the site or admin as the contents will never be updated.

This PR changes the output of the module so that instead of a list of non-updating articles a message is displayed.

* [4.0] Use MVCFactory to create model (#34092)

* Use MVCFactory to create models

* CS

* Fix row selecting, when module is disabled (#34273)

* Media web service implementation.

* Media web service implementation.

* Fix hard coded adapter name default.

* Fix missing url and tempUrl attributes in single item response.

* Remove useless comments.

* Replace 'PATH' with 'STRING' for cleaning of input parameters.

* Adds required parameter checks and removes global exception handling.

* Adds media web service specific language strings.

* Adds exception handling.

* Adds missing exception handler and fixes wrong path return value after move/rename.

* Use exception message as error title.

* Adds proper FileNotFound exception handling for GET requests.

* Fixes handling of status code.

* Fixes some types, formatting and similar stuff.

* Fixes yet another sloppy typo.

* restore file

* Fix some docs

* Adapter endpoint

* Add plugin to install file

* Add tests

* Update api/components/com_media/src/Helper/MediaHelper.php

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

* Update api/components/com_media/src/Helper/MediaHelper.php

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

* Update api/components/com_media/src/Model/MediaModel.php

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

* Update api/components/com_media/src/Model/MediumModel.php

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

* Update api/components/com_media/src/View/Media/JsonapiView.php

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

* Update libraries/src/Error/JsonApi/SaveExceptionHandler.php

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

* Update api/components/com_media/src/Controller/MediaController.php

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

* Update api/components/com_media/src/Controller/MediaController.php

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

* Update api/components/com_media/src/Model/AdaptersModel.php

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

* Update api/components/com_media/src/Model/MediaModel.php

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

* docs

* Update api/components/com_media/src/View/Media/JsonapiView.php

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

* int

* cs

* cs

* more cleanup

* tabs

* restore

* Test all endpoints

* Update api/components/com_media/src/Model/MediaModel.php

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

* Hardening

* Tests fix for drone

* Update Api.php

* Create directory in test with correct permissions

* Add more tests and remove static helper

* Update tests/Codeception/api/com_media/MediaCest.php

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

* Update tests/Codeception/_support/Helper/Api.php

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

* cs

Co-authored-by: Brian Teeman <brian@teeman.net>
Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: infograf768 <infografjms@gmail.com>
Co-authored-by: Quy <quy@fluxbb.org>
Co-authored-by: Ruud <info@onlinecommunityhub.nl>
Co-authored-by: Tuan Pham Ngoc <github@joomdonation.com>
Co-authored-by: Fedir Zinchuk <getthesite@gmail.com>
Co-authored-by: Pieter-Jan de Vries <pieter@obix.nl>
2021-11-23 20:20:07 +01:00
Benjamin Trenkle
3ef1b15fe7
Bump to 4.1-alpha3 2021-11-22 21:33:38 +01:00
George Wilson
efb87a1428
Add a proper error message if a pack fails to download (#35841) 2021-11-21 14:23:21 +01:00
Benjamin Trenkle
f3efe182c1
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
# Conflicts:
#	administrator/language/en-GB/install.xml
#	administrator/language/en-GB/langmetadata.xml
#	administrator/manifests/files/joomla.xml
#	administrator/manifests/packages/pkg_en-GB.xml
#	api/language/en-GB/install.xml
#	api/language/en-GB/langmetadata.xml
#	installation/language/en-GB/langmetadata.xml
#	language/en-GB/install.xml
#	language/en-GB/langmetadata.xml
#	libraries/src/Version.php
2021-11-15 14:45:13 +01:00
Khushi Rauniyar
0ae41f9869
Removed Complete & from open site and open admin button (#35988)
* Removed Complete & from open site and open admin button after installation

* Update joomla.ini

* Update joomla.ini
2021-11-13 23:49:21 +01:00
Benjamin Trenkle
4a114da2e2
Create release 4.1 Alpha2 2021-10-24 22:15:10 +02:00
wilsonge
b3de496a33
Bump to 4.0.5 development 2021-10-24 19:51:39 +01:00
zero-24
fc821911bb
reset to dev 2021-10-21 07:54:30 +02:00
Benjamin Trenkle
447c628bcb
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
# Conflicts:
#	.drone.yml
#	administrator/language/en-GB/install.xml
#	administrator/language/en-GB/langmetadata.xml
#	administrator/manifests/files/joomla.xml
#	administrator/manifests/packages/pkg_en-GB.xml
#	api/language/en-GB/install.xml
#	api/language/en-GB/langmetadata.xml
#	installation/language/en-GB/langmetadata.xml
#	language/en-GB/install.xml
#	language/en-GB/langmetadata.xml
#	libraries/src/Version.php
2021-10-19 15:26:27 +02:00
wilsonge
6c0b201d35
Tag 4.0.4 RC 2021-10-17 18:02:43 +01:00
zero-24
f503f0186f
Joomla! 3.10.3 Release Candidate 1 2021-10-16 15:57:48 +02:00
Phil E. Taylor
b1d6e3b749
Cleanup comments to comply with coding standards (#35141) 2021-10-07 16:32:42 +02:00
Dimitris Grammatikogiannis
fe3db546aa
[4.0] Update Bootstrap to 5.1.1 (#35518) 2021-10-03 22:07:37 +01:00
Benjamin Trenkle
e8c1f5fe7a
Bump to version 4.1.0-alpha1 2021-09-27 17:58:26 +02:00
wilsonge
a181a68914
Reset to dev 2021-09-14 08:09:36 +01:00
zero-24
678f02a65b
reset to dev 2021-09-12 12:19:10 +02:00
zero-24
7afea5be26
Joomla 3.10.2-rc1 2021-09-12 11:40:23 +02:00
wilsonge
35dc6cecda
Tag 4.0.3 RC 2021-09-12 10:23:22 +01:00
joomla-translation-bot
5921e439d6
Translation Update (#35379) 2021-09-11 23:21:57 +01:00
Benjamin Trenkle
3ab65030d5
[4.0] Make transitions translateable (#35457) 2021-09-11 22:58:56 +01:00
Phil E. Taylor
82e825293b
[4] Remove default secret (#35139) 2021-09-09 18:15:09 +01:00
Phil E. Taylor
b1b445e3a6
[4] Remove PHP from a plain text file (#35138) 2021-09-09 18:11:13 +01:00
zero-24
7db662a645
update ro-RO installer language 2021-09-03 16:56:44 +02:00
wilsonge
1bf44a5608
Reset to dev 2021-08-24 22:15:26 +01:00
zero-24
8466581a27
update version of sk-SK installer language 2021-08-24 12:52:48 +02:00
wilsonge
e21a64bfb3
Reset to dev 2021-08-23 20:53:16 +01:00
joomla-translation-bot
3bb6894423
Translation Update (#35321) 2021-08-23 19:03:01 +01:00
Phil E. Taylor
396aae10a9
[4] Dont delete /installation in development mode (#35220) 2021-08-23 11:09:46 +01:00
Phil E. Taylor
268e49293f
[4] Ensure opcache file invalidate on file copy & delete (#32915) 2021-08-23 10:52:14 +01:00
Brian Teeman
a0e2f45501
[4.0] change %s to %d (#34845) 2021-08-23 11:22:49 +02:00
zero-24
9ffe7d40da
reset to dev 2021-08-22 19:49:56 +02:00
zero-24
145af88431
updates for cy-GB installer language 2021-08-22 17:30:01 +02:00
Tobias Zulauf
975b0e2855
[3.10] Add missing mssql updates (#35163)
* add missing mssql updates

* add the install SQl too

* Update installation/sql/sqlazure/joomla.sql

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

* Fix smallint default value type

Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
2021-08-22 12:47:39 +02:00
zero-24
672ee343a2
update sv-SE installation language 2021-08-19 01:46:40 +02:00
zero-24
158c1be2ba
Fix a typo as discussed with the TT for cs-CZ on the forum 2021-08-18 17:00:12 +02:00
zero-24
9b4df4eeed
update cs-CZ installer language 2021-08-18 15:42:12 +02:00
zero-24
fc5ca06d64
Update it-IT installation language 2021-08-17 19:03:24 +02:00
Harald Leithner
ae15afbca7
Reset to dev 2021-08-17 13:56:30 +02:00
Harald Leithner
0d9f781485
Accept failing opcache_invalidate on installation (#35171) 2021-08-17 10:15:52 +01:00
Fedir Zinchuk
f2568a7260
Fix installation js for messages (#35173) 2021-08-17 10:01:28 +01:00
Harald Leithner
cd2ea50de8 Only invalidate installation/index.php on installation folder removal 2021-08-17 10:27:25 +02:00
George Wilson
f91d97b25c
Installation cleanup (#35168) 2021-08-17 09:20:27 +01:00
joomla-translation-bot
b2d763422c
Translation Update (#35098) 2021-08-16 23:38:06 +01:00
George Wilson
eee2b645a3
[4.0] Render the full information in the installer (#34900) 2021-08-16 23:26:25 +01:00
Phil E. Taylor
399c425fc0
remove redundant folder (#35140) 2021-08-16 21:15:34 +01:00
zero-24
1483ff70c0
Update fa-IR, nl-NL, ru-RU, sk-SK, th-TH installation languages 2021-08-16 21:28:06 +02:00
Richard Fath
fa790f4fd3
[4.0] Fix assets for workflow tables for new installations and updates (#35113) 2021-08-15 20:51:14 +01:00
zero-24
c0cd79a0d6
reset to dev 2021-08-14 13:27:22 +02:00
zero-24
36a1aaa29f
Update cy-GB installation language 2021-08-14 11:48:34 +02:00
zero-24
fb7981d128
update ka-GB installation language 2021-08-13 23:59:00 +02:00
zero-24
6f1b669e35
Add es-ES, pt-PT, ta-IN, uk-UA Installer language updates 2021-08-13 23:28:53 +02:00
zero-24
2c199933da
Update sw-KE installer language 2021-08-13 16:26:48 +02:00
zero-24
c5c9cd0ab6
fix broken tabs 2021-08-13 16:21:45 +02:00
zero-24
8082cb6148
Update ja-JP installation language 2021-08-13 16:19:34 +02:00
zero-24
145e86b6d5
update da-DK installer language 2021-08-13 15:44:28 +02:00
zero-24
e8835739ba
go back to 2007 2021-08-13 15:06:37 +02:00
zero-24
726e1a99ed
update copyright line 2021-08-13 15:05:04 +02:00
zero-24
1df4579cde
update installer de-AT, de-CH, de-DE, de-LI and de-LU 2021-08-13 14:58:02 +02:00
zero-24
e231edbc1e
update fa-IR 2021-08-13 10:49:40 +02:00
Harald Leithner
628aee40e1
Update installation language date on version bump (#35097) 2021-08-12 12:01:26 +02:00
zero-24
bd97cfecdf
Joomla! 3.10.0 Release Candidate 2 2021-08-09 13:10:56 +02:00
Tobias Zulauf
adc8982470
Joomla 3.10 EOS Plugin (#34453)
* Add inital EOS Plugin version

* remove unneded constants

* more improvments for the plugin

* make sure we dont reach this until the final date is aviable

* fix header content

* doc blocks

* Update plugins/quickicon/eos310/eos310.php

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

* update docs links

* drone, thanks

* make date language aware + change strings as suggested and and a "new tab" indicator

* use DATE_FORMAT_LC3

* Update plugins/quickicon/eos310/eos310.php

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

* Update plugins/quickicon/eos310/eos310.php

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

* target blank; only one link; version check when not uninstalled; strip_tags for quickicon message

* bring in the snooze stuff

* add the JS part

* move it to the right folder

* messages

* add the option to add the rel tag

* some more changes to the messages; minified js version; php code cleanup

* No messages yet so nothing to snooze

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

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

* Update plugins/quickicon/eos310/eos310.php

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

* Update plugins/quickicon/eos310/eos310.php

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

* Update plugins/quickicon/eos310/eos310.php

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

* Update plugins/quickicon/eos310/eos310.php

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

* alpha sort and typos

* Update plugins/quickicon/eos310/eos310.xml

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

* Update administrator/language/en-GB/en-GB.plg_quickicon_eos310.sys.ini

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

* Update plugins/quickicon/eos310/eos310.xml

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

* Check and show the the alert and quickicon message

* drone

* fix xml description

* the updated strings thanks @softforge

* Attribute values should be quoted using double ("") quotes. Optional attributes should be omitted. thanks @sandewt

Co-authored-by: Brian Teeman <brian@teeman.net>
2021-07-25 11:37:10 +02:00
Allon Moritz
a8c023f049
[4.0] CSS variables should be generic (#34621) 2021-07-16 00:12:56 +01:00
zero-24
0655cf5c20
Joomla! 3.10.0 Alpha9 2021-07-13 20:52:30 +02:00
Brian Teeman
8cb81235c5
[4.0] Crowdin comments (#34671)
This PR updates the comments in language strings to a format that crowdin understands as requested by @conconnl https://github.com/joomla/core-translations/issues/1

Basically comments are moved to the end of the line in the *.ini

Note comments which are not for translators such as a comment used to indicate a group of strings have not been changed
2021-07-12 22:07:37 +02:00
Brian Teeman
132a25057f
[4.0] doc site links (#34762)
All links go the docs.joomla.org web site should use  `Special:MyLanguage` in the url as this enables the user to be automatically redirect to the correct language version of the linked page.

Code Review
2021-07-12 18:11:27 +02:00
Brian Teeman
6424fc360e
[4.0] oops png (#34753)
* [4.0] oops png

png was accidentally placed in the doc and the image filetypes. this pr corrects that.

to test you will need to apply the pr
go to the media manager options
delete the content of the Legal Document Extensions (File Types)
save
(this will put the correct defaults back)
go to articles and add a png as an intro image

* must remember to save all changes before committing
2021-07-10 12:05:47 -07:00
Phil E. Taylor
95d4bc68dd
[4] Correctly return from display method, correct the doc for that too - manually. (#34062) 2021-07-05 16:23:07 +01:00
Brian Teeman
7a58d05cf5
[4.0] webp support (#34690)
# added partial support for webp by adding webp to the Legal Image Extensions (File Types) and Legal MIME Types

This PR completes the support for webp by adding webp to the Allowed Extensions

Also adds thumbnail and icon for webp

Makes sure the default values in the xml matches the base.sql

This PR does __not__ add the ability to edit a webp image as I tried - cropperjs is not compatible with firefox for windows. As a result the edit icon is not displayed for webp images
2021-07-03 20:11:19 +01:00
Dimitris Grammatikogiannis
478f651631
[4.0] Select image/audio/video/document file from Media Manager (#34634) 2021-07-02 09:43:20 +01:00
wilsonge
6274e5f136
Merge commit 'f2b6d58' into 4.0-dev 2021-06-14 01:00:39 +01:00
Dimitris Grammatikogiannis
da4ced6b2a
[4.0] JS files are full of XSS (#34472) 2021-06-13 23:47:05 +01:00
zero-24
44bfc41a0f
Joomla! 3.10.0 Alpha7 2021-06-13 14:50:08 +02:00
Stefan Wendhausen
e62323fc97
[4.0] add rel attribute in joomla.ini (#34434) 2021-06-07 23:04:22 +02:00
Brian Teeman
f88caa8806
[4.0] capitalisation of styles (#34399)
* [4.0] capitalisation of styles

Nothing major but it bugs me that the template styles are "atum - Default" and "cassiopeia - Default" with the template name being all lower case.
2021-06-06 15:15:48 +02:00
Phil E. Taylor
45e0c10c23
[4] Set the correct default for record_hits when using php (#34318)
* Set the correct default for record_hits
* set "record_hits":"1" in db at installation time
2021-06-02 21:02:08 +02:00
wilsonge
44ed4113a2
Handle bug when package fails to extract 2021-06-01 20:36:07 +01:00
wilsonge
8117778428
Fix undefined function 2021-06-01 00:59:50 +01:00
George Wilson
04336c3ae1
[4.0] Point to J4 translations list (#34302)
* Point to J4 translations list

* Combine with previous sql script and use correct where clause

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
2021-06-01 00:40:59 +01:00
Phil E. Taylor
7406c68d63
[4] filter to bool the cache_platformprefix and debug_lang_const on save (#34148) 2021-05-31 10:07:54 +02:00
zero-24
fd49a6a0cd
Joomla! 3.10.0 Alpha6 2021-05-30 16:01:11 +02:00
Brian Teeman
8df2de63db
[4.0] Notification icons (#34226) 2021-05-29 08:44:56 +02:00
Phil E. Taylor
f61b9ae293
[4] Cleanup response from deleting /installation folder (#34173) 2021-05-28 13:48:42 +01:00
Hannes Papenberg
1de64d7825
[4.0] Smart Search: Adding index to taxonomy table (#33746) 2021-05-26 13:55:53 +02:00
Harald Leithner
5b54c98b76 Merge branch 'staging' into 3.10-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
2021-05-25 17:08:03 +02:00
Richard Fath
1875dc15ae
[4.0] Adapt blog sample data and dropdown menus on position "menu" to new collapsible menu layouts (#34086)
* Use collapsible dropdown menu in blog sample data

* Update SQL for modules on the menu position

* Revert update for module layouts

* Use non-collapsible default layout for main menu site on new installations
2021-05-25 11:46:19 +02:00
Simone Bussoni
41c8ad3378
[4.0] Correct getPhpSetting(): "intl" not "instl" (#34179)
Little typo in $setting->label for the new check about php_intl.
2021-05-24 11:22:31 -07:00
Phil E. Taylor
6ecd791cfb
Remove unused file (#34171) 2021-05-24 16:38:07 +01:00
Harald Leithner
f2b6d58380
Reset to dev 2021-05-24 12:30:21 +02:00
Brian Teeman
499e7372f7
[4.0] GD, iconv and intl settings test (#33977)
* [4.0] iconv and intl settingss test

In a recent PR the status of these two php functions was added to the system info.

This PR adds the same information to the pre-install and pre-update checks

Co-authored-by: Quy <quy@fluxbb.org>
2021-05-23 23:15:17 +02:00
Brian Teeman
75e7c3fc08
[4.0] jpeg images (#34113)
Before this PR a jpeg image would not have a thumbnail image in the media manager AND the icon for editing an image was missing.

This PR has sql changes but does not have an update sql as its changing userdata

To test either do a complete fresh install OR go to the options for media manager and DELETE the Legal Image Extensions (File Types) and then save
2021-05-23 06:09:42 -07:00
Brian Teeman
9dcce910ad
[4.0] metatitle (#33939)
@philetaylor spotted this #

Meta tags are for data that cannot be represented by html. [mdn](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/meta) specifically states that title is one of the things you do NOT need to set a meta tag for.

I am guessing that at some point over 10 years ago we mistakenly had this tag and it was removed but this one bit was left.

This PR stops the value being set in configuration.php on new installs
This PR stops a frontend display of a newsfeed adding meta name=title to the head
This PR will not remove the line from an existing configuration.php as its userdata we shouldnt touch. But as its no longer referenced anywhere there is no problem.
2021-05-19 23:27:01 +01:00
Brian Teeman
8e2624aea9
[4.0] @since (#33926) 2021-05-19 23:24:45 +01:00
Richard Fath
b1a806af66
[4.0] Fix assets table lft and rgt and add missing assets for modules (#33924)
* Fix assets table lft and rgt and add missing assets for module

* Same mistake as every year
2021-05-19 22:55:40 +01:00
Richard Fath
93af3cf3e2
[4.0] Fix initial value of the Cassiopeia template style parameter "brand" for new installation and update and use it in error.php, too (#33930) 2021-05-19 22:54:47 +01:00
Phil E. Taylor
e27f9ea8fc
Case in function/method call doesn't match the case in declaration (#33982) 2021-05-19 22:20:57 +01:00
Phil E. Taylor
b043c82947
remove no such param from method call (#33965) 2021-05-19 21:02:47 +01:00
Harald Leithner
da37c7363b Prepare Joomla! 3.9.27 Release Candidate
Signed-off-by: Harald Leithner <leithner@itronic.at>
2021-05-19 13:01:27 +02:00
Hannes Papenberg
d4ff5dc398
[3.9][SECURITY] Block usage of FLoC by default (#33212)
Co-authored-by: Brian Teeman <brian@teeman.net>
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>
Co-authored-by: Harald Leithner <leithner@itronic.at>
Co-authored-by: Quy <quy@fluxbb.org>
2021-05-18 20:45:37 +02:00
Brian Teeman
a016bd0581
[4.0] remote install link (#33933)
Pull Request for Issue #33931
2021-05-18 20:04:15 +02:00
Richard Fath
fe7e19675a
Remove table "#__csp" from support.sql (#33835) 2021-05-13 23:29:58 +02:00
Brian Teeman
c598e13d3f
[4.0] privacy data export email (#33613)
* [4.0] privacy data export email

The body and the subject for this email were reversed.

PR for #33600

This can not be tested with patchtester
This can not be tested using database fix

You will need to either code review or do a fresh install or update to the release [ackage included with this pr

* Update administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-05-07.sql

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

* Update administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-05-07.sql

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

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
2021-05-07 08:25:38 -07:00
Tobias Zulauf
328b7d39e6
[4.0] Remove com_csp and move the CSP configuration to the HttpHeaders plugin (#33550) 2021-05-07 09:05:31 +02:00
Ciaran Walsh
cbca409318
[4.0] Admin UI repaint (#33100)
* init

* cs

* cont

* [4.0] Remove atum/Service/HTML/Atum.php requirement

* inc composer.lock

* inc component and login

* Update composer.lock

* revert composer.lock update

* try that again

* set numeric hue default

* rm login and error imports

* regex with hsl

* err and comp

* cont

* cont

* cont

* cont

* cont

* cont

* rm card classes

* mobile header items

* wip

* this should be ok

* cs

* header refactoring

* Exclude Bootstrap DropDowns

* Apply the same rendering in all layouts

- restore scripts in the head

* add imports

* safety

* Remove the added # when clicking on the menu collapse

* There is no ul[role="menubar"]

* cont

* quicklinks js

* typos

* Cleanup further the template js

* cs

* cont

* done

* composer.lock

* scss lint

* composer update

* composer again

* composer again

* Restore original composer

Someone needs to remove `"ozdemirburak/iris": "2.0.*",`

* Update administrator/templates/atum/scss/_variables.scss

* CS

* composer is extremelly picky

* rehash that

* restore original composer.{json/lock}

Someone needs to remove "ozdemirburak/iris"

* fixes

* Update administrator/templates/atum/html/layouts/status.php

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

* Update administrator/templates/atum/html/layouts/status.php

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

* Update build/media_source/com_media/scss/components/_media-toolbar.scss

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

* Update administrator/templates/atum/scss/blocks/_login.scss

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

* Update administrator/components/com_cpanel/tmpl/cpanel/default.php

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

* Update administrator/templates/atum/scss/blocks/_sidebar.scss

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

* rm sidebar link color lang string

* media infobar

* rm permissions nested tabs border

* 'Add module ....' style

* install

* Fix modal,etc status bar

* PHP, SCSS CS

* Fix the logos for Safarti, cleanup

* Do the logo sizing in the css

* Lint it

* Update default.php

* Update default.php

* update sql’s

* Update administrator/modules/mod_post_installation_messages/tmpl/default.php

* Update administrator/modules/mod_messages/tmpl/default.php

* Update administrator/modules/mod_user/tmpl/default.php

* Update administrator/modules/mod_messages/tmpl/default.php

* Update installation/template/index.php

* Fix sqls

* Update default.php

* mobile toolbar

* quickicons-amount hvr

* media-info close position

* views missing background

* one more

* badge contrast

* misc

* lint

* Update installation/sql/mysql/base.sql

* Update installation/sql/postgresql/base.sql

* use success/danger for create/clear buttons

* Revert "use success/danger for create/clear buttons"

This reverts commit 3116cfda78.

* rm nested cards

* scoped sidebar badge color

* some missing main-card classes

* small revert

* Update administrator/components/com_installer/tmpl/updatesite/edit.php

* Update administrator/components/com_languages/tmpl/language/edit.php

* Fix menu edit page

* Sampledata script fixes

* Improve sampledata

* Scroll to view the message

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

* more fixes for sampledata

* scope table shadow to just list

* mm

* Update default_modal_file_body.php

* increase tabs border-color contrast

* modals

* lint

* Tests

* Also

* Revert the last one

* Add the content back

* composer (?)

* Revert "composer (?)"

This reverts commit 644059bce5.

* Fix modals

* Modal title light

* Fix inconsistent gap

* modal padding

* composer

* module select modal

* com_redirect

* mange folders shadow

* new module modal

* install horiz scroll

* Fix conflicts

* composer again

* sample data manage btn pos

* edit menu item card

* mass mail user spacing

* Update default_batch_body.php

* correct padding for batch modals

* contentpane spacing

* partly resolve sysinfo responsive

* Add bottom margin

* cs

* cs

* cs

* cs

* cs

* cs

* cs

* cs

* cs

* cs

* cs

* cs

* border contrast (again)

* template style assignment

* joomlaversion

* media responsive quick fix

* increase input border contrast

* nav hover contrast

* Add update SQL scripts

* choices computed height

* increase header drop item height

* link entire new module

* select module title to h2

* privacy dash footer spacing

* link underlines

* rm mod menu assign card style

* fix choices vert align

* strong highlight on active tab

* center align add module search

* border between tab content columns

* match list group padding with tables

* media list icon width

* alerts

* fix alerts text/icon color

* CS

* login warning alert icon color

* text only header joomlaversion

* fix up login

* quickicons blind fix for safari

* remove main background pattern

* login drop display

* scope rotating angle icons

* missing featured icon

* lint

* vert centre mobile toolbar toggle

* minor tweaks

Co-authored-by: dgrammatiko <d.grammatiko@gmail.com>
Co-authored-by: Harald Leithner <leithner@itronic.at>
Co-authored-by: Quy <quy@fluxbb.org>
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
2021-05-06 10:41:55 +02:00
Quy
239c8b4360
Remove text-muted (#33516) 2021-05-04 17:53:51 +02:00
Brian Teeman
c10b8a96ac
[4.0] type=list options (#33517)
Fields that have a type of list should have a validation=options

code review
2021-05-03 14:32:15 -07:00
Hannes Papenberg
9b0a9f7d63
[4.0] Removing GUI parts of FTP layer (#33390) 2021-05-03 16:32:57 +01:00
Richard Fath
b9ae1ca658
[4.0] Remove display widths for integer data types from SQL scripts for MySQL and MariaDB databases (#32608) 2021-05-02 23:16:29 +01:00
Brian Teeman
7b98bbb978
[4.0] Installation Remove [a11y] (#33448)
This pr moves the paragraph description from outside the table to place it correctly as a caption inside the table.
It adds scope=col to the table headers and scope=row to the label
2021-05-02 21:57:59 +02:00
Tuan Pham Ngoc
d151fd31af
[4.0] Subform UX (#33096) 2021-04-25 12:04:20 +02:00
Brian Teeman
cb26f9e6dd
[4.0] webp support in templates (#33087) 2021-04-24 10:13:36 +02:00
Tuan Pham Ngoc
43fb462bc3
[4.0] Mail Templates improvement (#33230) 2021-04-23 11:30:54 +02:00
Brian Teeman
d5c23d64ef
[4.0] Admin modules bootstrap (#33045) 2021-04-23 11:29:21 +02:00
Tuan Pham Ngoc
015a957432
[4.0] Rename Fields - Subfields plugin to Fields - Subform plugin (#33200) 2021-04-23 08:44:15 +01:00
Dimitris Grammatikogiannis
56f88c45f3
[4.0] Decouple messages from core.js (#32747) 2021-04-19 08:26:56 +02:00
AndySDH
2c302641aa
[4.0] Updating all views to use H1 for Component Title when Menu Title is hidden (#32525)
* Update category_default.php

* Update list.php

* Remove unused page_subheading param, Remove unused page_subheading

* Update components/com_tags/src/View/Tag/HtmlView.php

* Update joomla.ini

* Update multilang.php

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
2021-04-17 17:19:07 +02:00
Phil E. Taylor
51e8f235b0
[4] Change link to Joomla News (#33058) 2021-04-16 09:29:18 +02:00
Harald Leithner
8004e90379 Merge branch 'staging' into 3.10-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
#	installation/language/ja-JP/ja-JP.xml
#	language/en-GB/en-GB.xml
#	language/en-GB/install.xml
#	libraries/src/Version.php
2021-04-13 17:13:18 +02:00
Harald Leithner
10f8eb4d72 Reset to dev 2021-04-13 17:08:36 +02:00
Harald Leithner
6796300350 Prepare Joomla! 3.9.26-rc 2021-04-07 23:45:23 +02:00
Thomas Hunziker
41566bb93b
Updated japanese installation language files (#33054) 2021-04-07 21:16:08 +02:00
Phil E. Taylor
aaa7201565
Allow period in quoted identifier for db name (#32949)
Signed-off-by: Phil E. Taylor <phil@phil-taylor.com>
2021-04-01 13:52:53 +01:00
Richard Fath
f9f690432a
[3.10] Remove display widths for integer data types from SQL scripts for MySQL and MariaDB databases (#32607)
* Remove display widths for integer types from 3.10 schema updates for mysql

* 3.10 - Remove display widths for integer types from mysql/joomla.sql

Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com>
2021-03-30 22:38:33 +02:00
zero-24
30d26a15de
Merge branch 'staging' of github.com:joomla/joomla-cms into 3.10-dev 2021-03-30 22:37:20 +02:00
Phil E. Taylor
afc196adc6
replace https://resources.joomla.org (#32907)
* update url

* replace redirected and dead urls

Signed-off-by: Phil E. Taylor <phil@phil-taylor.com>
2021-03-30 07:47:50 +02:00
Richard Fath
3c08cfe150
[3.x] Remove display widths for integer data types from SQL scripts for MySQL and MariaDB databases (#32606) 2021-03-27 15:53:58 +01:00
Harald Leithner
2dab92fdb4
Fix Joomla version note (#32731) 2021-03-18 16:15:09 +01:00
Constantin Romankiewicz
0043347b58
[4.0] Fixed menu params for front page item on installation (#32550)
* Fixed menu params for front page item on installation.

* Fixed postgres installation file as well.

* Added show_associations menu parameter.
2021-03-10 10:50:15 +01:00
Tuan Pham Ngoc
cd4b0e1682
[4.0] Fix installation folder not being deleted (#32599)
* Update remove.js

* Thanks @richard67

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

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
2021-03-06 17:31:26 +01:00
Harald Leithner
2387bb05a1 Reset to dev 2021-03-02 16:07:39 +01:00
Dimitris Grammatikogiannis
fdba1b1523
Improvements to fatal error page generation (#31743) 2021-02-25 16:32:37 +00:00
Harald Leithner
4b5bca4cef Prepare Joomla! 3.9.25 Release Candidate
Signed-off-by: Harald Leithner <leithner@itronic.at>
2021-02-24 23:07:25 +01:00
zero-24
32006674e8
Joomla 3.10.0-alpha5 2021-02-02 20:08:47 +01:00
Brian Teeman
9f2fc00eb5
[4.0] badge --> bg BS5 (#32138) 2021-01-24 17:19:13 +00:00
George Wilson
5785177ede
Bootstrap 5 (#32037) 2021-01-22 21:46:48 +00:00
Brian Teeman
b081ccf3a9
[4.0] en-* installation strings (#32088)
Minor grammar corrections
2021-01-20 00:26:16 +01:00
Harald Leithner
333d54ed95 Merge branch 'staging' into 3.10-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
#	installation/language/fa-IR/fa-IR.ini
#	installation/language/fa-IR/fa-IR.xml
#	language/en-GB/en-GB.xml
#	language/en-GB/install.xml
#	libraries/src/Version.php
2021-01-12 16:13:39 +01:00
Harald Leithner
62c29c11c8 Reset to dev
Signed-off-by: Harald Leithner <leithner@itronic.at>
2021-01-12 08:30:20 +01:00
Thomas Hunziker
1bfc725e44
Updated installation language files for fa-IR (#31978) 2021-01-10 12:33:49 +01:00
zero-24
c633ec1479
Joomla! 3.10.0-alpha4 2021-01-07 19:26:20 +01:00
Hannes Papenberg
88e7243502
[4.0] Converting additional mails to mail templates (#31621) 2021-01-07 02:29:09 +00:00
zero-24
704b6d3141
Merge branch 'staging' of github.com:joomla/joomla-cms into 3.10-dev 2021-01-06 22:34:03 +01:00
Harald Leithner
bd4a56ea40 Prepare Joomla! 3.9.24 Release Candidate 2
Signed-off-by: Harald Leithner <leithner@itronic.at>
2021-01-06 15:07:47 +01:00
Thomas Hunziker
c323899ff0
Refactor and Cleanup JLIB_FILESYTEM strings (#31677) 2021-01-03 01:33:13 +00:00
Thomas Hunziker
9b42441cb4
Updated installation INI file (#31826) 2021-01-01 23:51:16 +01:00
Brian Teeman
0d4480119f
[4.0] Update Checks quickicon module (#31733)
PR for #28669 and elsewhere

This module displays many things that are not updates so lets change the module title to Notifications
2020-12-22 08:45:34 +01:00
Brian Teeman
ebc8186de6
[4.0] Remove IDs from URLs (#31370)
This PR changes the default  value for this setting that is found in com_content, com_contact and com_newsfeeds from the old showing of IDs in the url to the much improved new way of not displaying them.
2020-12-18 02:59:39 +00:00
Brian Teeman
5eba619c13
[4.0] plugin installation order (#31489)
This PR does two things

The first is simply to put the list of plugins to be installed back into alphabetical order. This makes it easier to maintain and find things in the database

The second is to set the plugin order

In general it probably doesn't matter at all what order the plugins are in but if you look at the ordering dropdown it looks a mess as many of the plugins have the same order. Some of the oldest plugins have an ordering value but most just have a 0.

This PR adds a value starting at 1 for each plugin grouped by type

This is only for new installs
This is only for mysql (if approved I will update postgresql as well)
2020-12-17 16:09:04 +00:00
Thomas Hunziker
1dbec4becc
[4.0] Refactor JInstaller strings (#31660) 2020-12-17 15:22:33 +00:00
Harald Leithner
e34d513477 Prepare Joomla 3.9.24-rc 2020-12-17 00:37:26 +01:00
zero-24
7de52474eb
Merge branch 'staging' of github.com:joomla/joomla-cms into 3.10-dev 2020-12-15 19:33:47 +01:00
wilsonge
a1158ee07f
Merge branch '3.10-dev' into 4.0-dev 2020-12-15 18:17:51 +00:00
wilsonge
8317122fe8
Merge commit '8758c0a' into 4.0-dev 2020-12-15 15:16:12 +00:00
Niels Braczek
3a5984d033
[4.0] Converted copyright statement to standard format (#31504) 2020-11-28 01:33:45 +00:00
Thomas Hunziker
36357bf7d6
Updating Installation Language Files (#31497) 2020-11-26 23:03:00 +01:00
Konstantin Kolos
721d70977b
[4.0] Incorrect language constant in installation files (#31487) 2020-11-26 14:36:25 +00:00
Thomas Hunziker
d2e0cd0e8a
Updated installation language files (#31476) 2020-11-25 10:20:10 +01:00
Harald Leithner
dca31ad54c Merge remote-tracking branch 'origin/staging' into 3.10-dev
# Conflicts:
#	.drone.yml
#	administrator/components/com_admin/script.php
#	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/da-DK/da-DK.xml
#	installation/language/de-AT/de-AT.xml
#	installation/language/de-CH/de-CH.xml
#	installation/language/de-DE/de-DE.xml
#	installation/language/de-LI/de-LI.xml
#	installation/language/de-LU/de-LU.xml
#	installation/language/el-GR/el-GR.ini
#	installation/language/el-GR/el-GR.xml
#	installation/language/en-GB/en-GB.xml
#	installation/language/hr-HR/hr-HR.xml
#	installation/language/it-IT/it-IT.xml
#	installation/language/nb-NO/nb-NO.xml
#	installation/language/nl-NL/nl-NL.xml
#	installation/language/ru-RU/ru-RU.xml
#	installation/language/sl-SI/sl-SI.xml
#	installation/language/sr-RS/sr-RS.xml
#	installation/language/sr-YU/sr-YU.xml
#	installation/language/sv-SE/sv-SE.xml
#	installation/language/sw-KE/sw-KE.xml
#	installation/language/ta-IN/ta-IN.xml
#	installation/language/th-TH/th-TH.xml
#	language/en-GB/en-GB.xml
#	language/en-GB/install.xml
#	libraries/src/Version.php
2020-11-24 17:25:02 +01:00
Harald Leithner
1a08c81844 Reset to dev 2020-11-24 17:14:20 +01:00
Thomas Hunziker
bfe4fc6aea
Updated installation language files (#31461) 2020-11-22 21:21:04 +01:00
Stefan Wendhausen
a71f2fac02
updated german language files (#31462) 2020-11-22 21:20:05 +01:00
Thomas Hunziker
8b48edd280
Updated installation language files (#31447) 2020-11-21 19:34:47 +01:00
Harald Leithner
a5b37ed5b1 Prepare Joomla! 3.9.23-rc 2020-11-19 16:18:38 +01:00
Konstantin Kolos
3355f2ee31
Missing lines JLIB_ when installing language packs (#31426) 2020-11-19 10:51:26 +01:00
Bear
0692188618
[4.0] Adds \ to all namespaced defines (#31293) 2020-11-08 18:34:49 +01:00
Bear
f2385d4ff7
[4.0] installer header (#31310)
* fix installer header

* color styling request by chmst
2020-11-08 10:08:52 +01:00
Harald Leithner
994c9d0416
[4.0] Remove mod_multilangstatus tampering from mod_user (#30113)
* Remove mod_multilangstatus tampering

* Remove namespace

* Publish multilingual status module on new installations

* Show only when multilanguage is enabled

* Remove switcher check

* Variable typo
2020-11-07 13:29:46 +01:00
SharkyKZ
0f26adc63e
Remove redundant id attribute (#31303) 2020-11-05 09:55:05 +00:00
zero-24
8758c0a3d2
Merge branch 'staging' of github.com:joomla/joomla-cms into 3.10-dev 2020-11-01 23:10:58 +01:00
Hans Kuijpers
282fd17f20
[4.0] rename Joomla core classNames fas fa- back to icon- (and still use Font Awesome) (#30707)
* ♻️ replace fas fa- by icon- and change scss variable fa-css-prefix from fa to icon

* replace fa- by icon-

* replace icon by #{$fa-css-prefix}

* move font-family from pseudo to element itself

* obsolete due to the iconPrefix

* remove case when equal to icon

* apply JLayout joomla.icon.iconclass for icon in Toolbar

* sanitize icon-icon- to icon-

* replace fas fa into icon in sql file

* replace fas fa into icon in vue files

* replace fas fa into icon in js files

* codestyle

* replace fa icon-search by icon-search

* replace fa- into icon-

* add missing prefix

* change order of namespace

* solution for fab = iconb-

* fix spacing next to icon when class does not start with icon-

* replace fas fa- by icon- after merge with most recent 4.0 changes

* prevent > 4 indents

* change order scss

* use double quotes in scss

* Update administrator/templates/atum/scss/blocks/_quickicons.scss

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

* Update build/media_source/system/scss/_icomoon.scss

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

* fix icons in installation

* replace fa- by icon-

* add styling for installation icons

* add pseudo element to icon eye

* replace fa- by icon-

* remove now obsolete strreplace

* extend to work with 'fas fa-' icons too. Introduction of $jicon-css-prefix next to $fa-css-prefix

* swap line 11 & 12 from the iconclass JLayout

* fixing Joomla logo icon

* add missing language icon

* revert earlier change. Add font awesome declaration in installation scss

* add missing trophy icon

Adds missing trophy icon

* combine icons from atum/scss/blocks/icons to build/media_source/system/scss/icomoon

and changed icons to onliners | sorted |uniq

* add missing Trophy icon

* add missing space

* fixes missing icons issue due to compiler quirk.

* Revert "fixes missing icons issue due to compiler quirk."

This reverts commit 53828ddf

* fixes missing icons issue due to compiler quirk."

* duplicate code

* more missing icons

* lots more missing icons

* bs functions called in root template.scss no need for duplicate

* removing duplicated definitions from iconclass.php

* removed unsupplied regular fontset

* Revert "removed unsupplied regular fontset"

This reverts commit b2f38746

* declare prefix's globally

* declare prefix's as default

* put :before back

* moving from iconclass.php to _icomoon.scss

* changed to icon-info-circle to match rest of icon-info usages

* all moved from iconclass.php except for unknowns

* put lost icons back.

* @quy fix

* removing obsolete classNames

* add missing icons

* added missing icons mentioned by @Quy in https://github.com/joomla/joomla-cms/pull/30707#issuecomment-699682784

* Update administrator/modules/mod_menu/tmpl/default_submenu.php

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

* added icons and sorted icons

* remove duplicate line

* beginning of mixin conversion

* oops, extra blank line

* u's

* t

* r-s

* wrong icons

* q

* Update build/media_source/system/scss/_icomoon.scss

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

* Update build/media_source/system/scss/_icomoon.scss

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

* Update build/media_source/system/scss/_icomoon.scss

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

* Update build/media_source/system/scss/_icomoon.scss

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

* Update build/media_source/system/scss/_icomoon.scss

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

* add missing icons

* apply DRY and convert a lot of duplicate code to simple foreach loop in scss

* pre-backup

* p's

* m-o

* l

* g-k

* reformat per drone

* reformat per drone

* change the each loop

* rewrite to use array(s)

* include icon-fw

* definition cleanup

* missing icons

* added imports to fix extends

* added missing spin function

* added special icons mapping

* better looking calendars

* fixes fa-spin(s)

* spinner => spin

* rewrite title of icomoon

* extend .list special types

* 🎨 code style fixes

* removal map-merge

* revert icon- to fas fa-

* revert icon- to fas fa-

* add icon text-width

* add icon-fax

added Icon-fax per request

* Update _icomoon.scss add spacinf

* remove duplicate declaration of icons

[class^="icon-"] and [class*=" icon-"] are taking care of it

* remove duplicate semi column

* remove joomla from icon list. Already declared in branded icon

* already set in icomoon

* removal obsolete icon

* Update administrator/templates/atum/scss/vendor/fontawesome-free/fontawesome.scss

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

* reapply icon

* Update build/media_source/system/scss/_icomoon.scss

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

* fas fa- => icon-

* far eqv iconr

* Update build/media_source/system/scss/_icomoon.scss

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

* add icons

icon-align-justify
icon-clipboard
icon-caret-down
icon-caret-up

* reapply icons

* reapply icons after solving merge conflicts

* replace fas fa- => icon-

* repalce fas fa- by icon-

* remove non-used style declaration

* change fas fa- into icon-

* reapply icons

* remove font-size, fixing size of icon in header

* fix loading icon-joomla

* change order loading font

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: Bear <programming@hallhome.us>
Co-authored-by: Quy <quy@fluxbb.org>
2020-10-28 18:06:35 +01:00
Bear
2c8e054a1b
[4.0] add fa Regular icons back into core availability (#31096)
* make svg's available

* change name to images

* adds regular fa fonts back

* add .far

* undo settings.json inclusion

* put atum imports in proper order

* Update _header.scss

small change to let ci run again

Co-authored-by: Robert Deutz <rdeutz@googlemail.com>
2020-10-27 14:49:39 +01:00
SharkyKZ
895e984905
Rename method arguments to use camelCase casing (installation directory) (#31153)
* Rename method arguments to use camelCase casing

* Rename argument

* Codestyle

Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com>

Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com>
2020-10-27 14:21:35 +01:00
zero-24
eab1cb010a
Joomla! 3.10.0 Alpha3 2020-10-24 19:11:41 +02:00
Richard Fath
3c340b5947
Fix wrong line break in params value (#31164) 2020-10-19 14:31:09 -07:00
SharkyKZ
f2ff1d4d81 Merge remote-tracking branch 'upstream/4.0-dev' into j4/cleanup/mod-user 2020-10-17 14:58:40 +03:00