joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-28 16:13:42 +00:00
Code Packages Releases Activity
47,720 Commits 4 Branches 470 Tags 762 MiB
fe70d45931
Commit Graph

9893 Commits

Author SHA1 Message Date
Franciska Perisa
fe70d45931
Merge branch '4.2-dev' into 4.2/upmerges/2022-03-29 2022-03-29 18:37:31 +02:00
Benjamin Trenkle
388b350a36
Revert to dev 2022-03-29 16:55:40 +02:00
Benjamin Trenkle
f49c451d1e
Bump to 4.1.1 stable 2022-03-29 15:27:09 +02:00
Roland Dalmulder
cee85cf33f
Merge branch '4.1-dev' into 4.2-dev 
# Conflicts:
#	administrator/manifests/files/joomla.xml
#	libraries/src/Version.php
 2022-03-27 09:59:10 +02:00
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