29
0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-17 17:44:57 +00:00
Commit Graph

72 Commits

Author SHA1 Message Date
wilsonge
a1158ee07f
Merge branch '3.10-dev' into 4.0-dev 2020-12-15 18:17:51 +00:00
wilsonge
cf4b96a68d
Codestyle fixes 2020-12-15 15:21:54 +00:00
wilsonge
af5b1001da
Merge commit '58e0942' into 4.0-dev 2020-12-15 01:36:51 +00:00
wilsonge
8487a6ca99
Merge commit '20615c6' into 4.0-dev 2020-12-01 19:53:46 +00:00
Niels Braczek
3a5984d033
[4.0] Converted copyright statement to standard format (#31504) 2020-11-28 01:33:45 +00: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
435d780d9a Prepare Joomla! 3.9.23
Signed-off-by: Harald Leithner <leithner@itronic.at>
2020-11-24 13:54:28 +01:00
Harald Leithner
58e0942f1f 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
2020-10-06 17:05:47 +02:00
Robert Deutz
65a102ef0e
Merge pull request #30714 from alikon/patch-81
[3.9] Log the from version on actionlogs when Joomla update
2020-09-26 16:46:16 +02:00
Nicola Galgano
ee6b10f32d
Update plugins/actionlog/joomla/joomla.php
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
2020-09-23 10:49:43 +02:00
Nicola Galgano
26ecf3af3b
default null 2020-09-23 10:44:07 +02:00
Nicola Galgano
1423af274c
added fallback for unknown version from 2020-09-23 08:31:56 +02:00
Nicola Galgano
144420a353
[3.9][plg_actionlogs] self activate account (#30725)
* self activate account

* self activation
2020-09-22 23:32:00 +02:00
Nicola Galgano
c3c84807c1
Update plugins/actionlog/joomla/joomla.php
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
2020-09-21 14:33:14 +02:00
Nicola Galgano
d78d0386c8
Update plugins/actionlog/joomla/joomla.php
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
2020-09-21 14:25:39 +02:00
Nicola Galgano
f84bda3064
old version 2020-09-21 11:57:19 +02:00
Harald Leithner
20615c623a Merge branch 'staging' into 3.10-dev
# Conflicts:
#	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/en-GB/en-GB.xml
#	language/en-GB/en-GB.xml
#	language/en-GB/install.xml
#	libraries/src/Version.php
2020-08-25 17:11:02 +02:00
Nicola Galgano
ae8d509c4d
change the action (#30407) 2020-08-18 16:55:03 +01:00
Nicola Galgano
28b34a76a9
[3.9] Log the event on actionlogs when Joomla update (#30157)
* update lang string

* trigger the onAfterUpdate event

* log the event

* event onJoomlaAfterUpdate already exists in j4

Co-authored-by: Quy <quy@fluxbb.org>
Co-authored-by: Brian Teeman <brian@teeman.net>
2020-08-17 12:45:20 +02:00
Niels Braczek
2ca2d4ebf0
Converted copyright statement to standard format (#29689)
* Converted copyright statement to standard format

* Converted copyright statement to standard format (re-done without rename heuristic)

* Converted copyright statement to standard format (re-done with new rename algorithm)

* Removed copyright year update

* Fixed tests to allow line feed at eof

* Reverted changes not directly related to copyright statement

* Exchanged copyright sign with '(C)' in SQL files

* Fixed creation date in XML files
(Why do people keep changing that?)

* Changed sw-KE.ini manually

* Removed link from copyright in SQL data
(their source, the XML files, do not contain the link)

* Replaced copyright sign with (C) in XML files

* Converted copyright statement for files in `build/`, `libraries/fof/` and `libraries/joomla/`

* Fixed encoding

* Replaced copyright sign with its ASCII representation '(C)' to avoid conflicts and improve consistency

* Reconstructed creation dates from JoomlaCode and source code

* Changed creationDate to creation date of that specific language file version using ISO format

* Update LegacyFactory.php
2020-08-12 17:57:18 +02:00
Phil Taylor
33e51f17d1
s/typo/spelling (#29808)
* s/typo/spelling

* revert
2020-06-28 20:54:18 +02:00
Phil Taylor
45bd91bbfd
Doc block cleanup (#29352) 2020-06-15 19:16:26 +02:00
wilsonge
d7451e6440
Tag Joomla 4 Beta 1 2020-05-30 20:41:05 +01:00
SharkyKZ
442e26bc1c
[4.0] AfterDelete events to return void (#29148) 2020-05-21 23:35:15 +01:00
SharkyKZ
578f004e2c
[4.0] AfterSave events to return void (#29146) 2020-05-21 11:28:35 +01:00
George Wilson
1c5f5e116e
Fix check for whether API is loggable 2020-03-24 11:39:54 +00:00
Nicola Galgano
c3aa06a1f2
[4.0][API][com_actionslogs] keep track of API requests (#27094) 2020-03-24 11:38:12 +00:00
Harald Leithner
4172b68dac Prepare Joomla 3.9.15 release candidate 2020-01-22 23:07:06 +01:00
George Wilson
23def74519 Merge commit '27f1a72' into 4.0-dev 2019-11-12 10:56:09 +00:00
marcochirienti
f23e4f68ad Replaced JFactory and JRoute occurrences (#26978) 2019-11-04 10:10:49 -08:00
SharkyKZ
869f042beb [4.0] [plg_system_privacyconsent] Error and notice on registration page (#26437) 2019-10-16 20:13:51 +01:00
wilsonge
23e92b5164 Joomla! 3.9.10
-----BEGIN PGP SIGNATURE-----
 
 iQHHBAABCgAyFiEEc8tLlhrb4aveTfJiRzuTXEnqGwgFAl0l/PkUHGxlaXRobmVy
 QGl0cm9uaWMuYXQACgkQRzuTXEnqGwgh2wv3b0Kf3tvpjGrcoT+Uf6e5l+XF5MkE
 lF4bABCWhSca+eaCgb471A7LGc5c5hsl3JqpolgBRGgQYW2cztnX/nXBc4VpVDUv
 fpmCWQnqCoHIV/TLajTTVnBfQrSQLiDQCYcilstMmUFAw0gdkRRY44ywLO8rOt2J
 6bDx41oraWHq5DXLQVicxhaCeprGVpIXsLUGVMTQUUPMZmcrmyrPcxb9//6X2tWk
 vZgBBOTYciaikqFxh0bM26s4eYl7HlCj5hWxamjYxnE2zKiNBt/ttpXfImoQoscj
 K+o2RJVGHZMh24CiaXoqA4BMsryDV+cRKxdt2rjMRQvFzQ0JTu2SPsFKP4VX3WYF
 0nciCApiZ8tJIjxUVLX5f69FUqYuiEE5ALapGXvlgEz7S4/5OaDTE1zex6uN73/R
 cYq/y2Nzoc0Z1jmDiDRfM8YbZF6a429UhiRRartXKubGvpu95VKSv1ahFXDRe3eW
 NkNocP0cZr051vz8icHxiGkqXV0Ql5wbuBU=
 =TDW0
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEE5a/8IjweQSgQZsLg74Exkxj8nQQFAl1q85sACgkQ74Exkxj8
 nQQdmgf9H/L8wqJC6oxSK20z30iA/ZHYEcwnB1YebfZWrgzZhrj/0ugrMJSL4Mp2
 2w3hxMKLTYnQ3GDmqmxgzPVn8rRuxMEh0r3pu7eJHq/oI4DPie+i4K+ymdHDVnAV
 Ngtkb+VkIC8V/uM3wMTeYQRfjWVIyYmZ8yo710nEhCtULXT2ZzZU8X0sxy5VokfW
 tHuKntIjYNlLexb14ZE4zMECMhjpbMbUAHFLbClkFo+CSCgKRYLJdV+CeyxskbFt
 1PjuPI6qGO80tfElTYiK8FZwidm3x/hG9/u1iCSOZOP9DRfnCz6yKrfhSKMuG6IV
 PNrt6pY/p8lN4XDl+IkaVas1V3bncA==
 =/9vt
 -----END PGP SIGNATURE-----

Merge tag '3.9.10' into 4.0-dev

Joomla! 3.9.10
2019-08-31 23:24:24 +01:00
Nicola Galgano
aa666ae6d1 suppress logout log message when blocked (#25812) 2019-08-23 16:12:11 +02:00
Hannes Papenberg
bcfe219c9d [4.0] Codestyle fixes for new CMS codestyle Batch 9/16? (#25462) 2019-07-11 22:46:32 +01:00
George Wilson
a8e5d9e21a
Add alias and rename the action log plugin base (#25445) 2019-07-06 10:12:14 +01:00
Roland Dalmulder
9e783e0157 [4.0] Start converting actionlogs to new format (#24936) 2019-06-30 08:36:31 +01:00
Stefan Wendhausen
4127c01de0 username vs name (#24992) 2019-06-22 08:59:36 +02:00
wilsonge
395f2fd254 3.9.4
-----BEGIN PGP SIGNATURE-----
 
 iQHIBAABCgAyFiEEc8tLlhrb4aveTfJiRzuTXEnqGwgFAlyGnIUUHGxlaXRobmVy
 QGl0cm9uaWMuYXQACgkQRzuTXEnqGwjJQwwA73Zana35ILtHIp0RwkIeqRu0tGKi
 8R7Nh5Z/LKohs4li9vGVl7/AE6dSN8dI3DPWwESYfoCrgk4TKkx4CM8nK5yohTcS
 c2DZr6AMBnYinMsA1b2cBsrN40NVBIDliEcQMCHT8cN6Jix4UyHRJkp69Pc0krpC
 2eM9ECgCXqHbq/19reBb4704gBCXCY1g4tWNKXCGLc5Oclpiv0+d8AdZV+FIXNs5
 QGBYlH3G3s6x+6ZKvIK6INfmUOvqjx3q8IvUYViRii++PNycdBbkJxIz3cKdG0KO
 OoF4r1WETOLguSOuGWwcqswlWGLXM31vK9WWAtkb0EPbiZuQboQpA8gSwM50/Qec
 WqM6TOmJKLwfnNWhqWIQYMCRVIeGbcPuMjfK4jwuN3duv7IskB5UWsPDew9x2kuU
 i7geUb9CFOcTJsyVGAnVc9r2e60Kz6dGImXZ6UFeBbLWlFzUYRgRfB7WVlWWQEPn
 88e59Nc408EOwSoqMfAL62mOZ9YsiLhtfdIV
 =gcys
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEE5a/8IjweQSgQZsLg74Exkxj8nQQFAl0FjxwACgkQ74Exkxj8
 nQQHgQf+LC0twEkxbgn4w3h53PXINXGiLv45F1MZwxD67GVBwHa5oNat8iBZHVpW
 fUf2Ul1J1OMeafGkwNr8/tlGoUJ136AyMQck/njLtK6PcrqfzjPgeNlTMOJ6e7L2
 L6zOavbxkGFMUlyFwIR2C6TxYTrI9SA+XLa2qE6k8xfu0E7kuVpeabBI5JYDXGBH
 qROadIAL9RlR2VUpbxv4useYxV0IzTYuLdEkau0K+GPnPkeR4iMKJUbnY/CPoDdA
 eipZT+xNzyb9hqkZs44Iwz9+FUQiZRHF/VVcD3vs0ljmy/zr00XztNKTMGKcx0jU
 Qx+LGozJrp09HgxafI1oFUkRmeMacg==
 =4nVD
 -----END PGP SIGNATURE-----

Merge tag '3.9.4' into 4.0-dev

3.9.4
2019-06-16 01:36:30 +01:00
wilsonge
611d837450
Merge tag '3.9.3' into 4.0-dev 2019-06-15 22:38:10 +01:00
Harald Leithner
60cbc2d678 Add prepared statements for plg_actionlog_joomla (#25046)
By @HLeithner
2019-06-08 20:39:31 +02:00
Brian Teeman
0e87d098d6 [4.0] @package fixes (#25098)
Fixes copy paste errors in the @subpackage

Can be merged on review
2019-06-03 10:53:10 +01:00
Nicola Galgano
19787a0caa fix for checkLoggable for com_checkin (#24086) 2019-03-11 11:41:20 +01:00
Harald Leithner
1ecb97f2dd Joomla! 3.9.4 Release Candidate 2019-03-08 18:05:28 +01:00
Nicola Galgano
2d2a756186 [com_actionlogs] - log cache actions (#22739) 2019-03-07 22:36:41 +01:00
Nicola Galgano
45a5c9d5d8 [com_actionlogs] - log actionlog purge/export (#22740) 2019-03-07 20:31:58 +01:00
SharkyKZ
dace21269b [com_actionlogs] Fix plugin links (#23857) 2019-02-11 16:11:39 +01:00
Nicola Galgano
4adb65642e [com_actionlog] username vs name on checkin (#23852) 2019-02-10 14:23:52 +01:00
Harald Leithner
6512ca0cb5 Prepare 3.9.3 release candidate 2019-02-09 20:21:34 +01:00
Nicola Galgano
6933bb16b8 [com_actionlogs] - log checkin actions (#23526)
* [com_ajax] - need to be protected

postgresql update

* log checkin

* udpate

* old one

* update fixes
2019-01-19 09:23:29 +01:00
Michael Babker
bc84ea1027
Prepare 3.9.2 release candidate 2019-01-11 07:41:07 -06:00