Commit graph

36304 commits

Author SHA1 Message Date
Marc Alexander
5b3d238804
Merge branch 'ticket/security/254' into prep-release-3.3.5 2021-10-01 22:35:54 +02:00
Máté Bartus
71b8e49b3c Merge branch '3.3.x' 2021-09-29 09:36:54 +02:00
Máté Bartus
1860a06eab
Merge pull request #6296 from 3D-I/ticket/16879
[ticket/16879] Add events to phpbb_mail()
2021-09-29 09:36:03 +02:00
3D-I
1862992ca7 [ticket/16881] Fix ACP statistics
PHPBB3-16881
2021-09-24 00:39:44 +02:00
3D-I
95fa6cceee [ticket/16881] Fix ACP statistics
PHPBB3-16881
2021-09-23 21:51:11 +02:00
3D-I
19076de94c [ticket/16879] Add events to phpbb_mail()
PHPBB3-16879
2021-09-22 22:39:19 +02:00
3D-I
27289cbfad [ticket/16879] Add events to phpbb_mail()
PHPBB3-16879
2021-09-20 22:02:25 +02:00
Marc Alexander
63e96031ef
Merge branch '3.3.x' 2021-09-20 11:27:27 +02:00
Marc Alexander
3d76942cdf
Merge branch 'prep-release-3.3.5' into 3.3.x 2021-09-20 11:27:10 +02:00
Marc Alexander
51cc7202f8
Merge pull request #6295 from marc1706/ticket/16878
[ticket/16878] Default to threads value of 1 when using argon with libsodium
2021-09-20 11:26:39 +02:00
3D-I
303a933403 [ticket/16879] Add events to phpbb_mail()
PHPBB3-16879
2021-09-19 03:59:46 +02:00
3D-I
54b54c41c6 [ticket/16879] Add event core.phpbb_mail_after
PHPBB3-16879
2021-09-19 03:00:59 +02:00
Marc Alexander
59e50d6d53
[ticket/16878] Default to threads value of 1 when using argon with libsodium
PHPBB3-16878
2021-09-18 11:45:23 +02:00
Marc Alexander
c741b65c25
Merge branch '3.3.x' 2021-09-16 11:02:36 +02:00
Marc Alexander
2a1656e7b3
Merge pull request #6293 from 3D-I/ticket/16868-33
[ticket/16868] Fix links to coding guidelines
2021-09-16 11:02:33 +02:00
3D-I
12ce75b5f5 [ticket/16868] Fix links to coding guidelines
PHPBB3-16868
2021-09-16 10:27:08 +02:00
Marc Alexander
b82d90eb39
[ticket/security/254] Add tests for validation
SECURITY-254
2021-09-13 10:38:35 +02:00
Marc Alexander
f302440297
[ticket/security/254] Disallow whitespace characters that might be invisible
SECURITY-254
2021-09-13 10:38:35 +02:00
Marc Alexander
b2e2d81d2d
Merge pull request #6290 from 3D-I/ticket/16850
[ticket/16850][4.0] Update webfont loader
2021-09-13 10:36:23 +02:00
Marc Alexander
9b0770f09f
Merge branch '3.3.x' 2021-09-13 10:33:13 +02:00
Marc Alexander
848021c743
Merge pull request #6291 from 3D-I/ticket/16850-33
[ticket/16850][3.3] Update webfont loader
2021-09-13 10:32:48 +02:00
Marc Alexander
c4b4e1d7a9
Merge branch 'prep-release-3.3.5' into 3.3.x 2021-09-13 10:32:30 +02:00
Marc Alexander
ed33f06235
Merge branch 'ticket/16850' into prep-release-3.3.5 2021-09-13 10:32:18 +02:00
3D-I
643845306a
[ticket/16850] Update webfont loader
PHPBB3-16850
2021-09-13 10:32:04 +02:00
3D-I
95511540ea
[ticket/16850] Update webfont loader
PHPBB3-16850
2021-09-13 10:31:56 +02:00
3D-I
0ff4d051df [ticket/16850] Update webfont loader
PHPBB3-16850
2021-09-12 21:50:09 +02:00
3D-I
b3b5fcc874 [ticket/16850] Update webfont loader
PHPBB3-16850
2021-09-12 21:48:29 +02:00
3D-I
1b4ba00a73 [ticket/16850] Update webfont loader
PHPBB3-16850
2021-09-11 17:02:12 +02:00
3D-I
e42013a2a6 [ticket/16850] Update webfont loader
PHPBB3-16850
2021-09-11 16:57:10 +02:00
Marc Alexander
a42ce508c9
Merge branch '3.3.x' 2021-09-11 13:40:02 +02:00
Marc Alexander
8caf2e7c59
[3.3.x] Update versions to 3.3.6-dev 2021-09-11 13:38:10 +02:00
Marc Alexander
a87a60c108
Merge branch 'prep-release-3.3.5' into 3.3.x 2021-09-11 13:36:37 +02:00
Marc Alexander
5b5502390d
[prep-release-3.3.5] Update changelog for 3.3.5-RC1 2021-09-08 22:37:18 +02:00
Marc Alexander
1db2d9c3c1
[prep-release-3.3.5] Add migration for 3.3.5-RC1 2021-09-08 22:37:11 +02:00
Marc Alexander
5ef0105a5f
[prep-release-3.3.5] Update version numbers to 3.3.5 2021-09-08 22:37:07 +02:00
Marc Alexander
e8421dbab1
[prep-release-3.3.5] Update version numbers to 3.3.5-RC1 2021-09-08 22:37:06 +02:00
Marc Alexander
7bd8d8f245
Merge branch '3.3.x' 2021-09-08 22:25:07 +02:00
Marc Alexander
e0197d711f
Merge pull request #6288 from marc1706/ticket/16870
[ticket/16870] Ensure to properly escape values when running db:migrate
2021-09-08 22:25:02 +02:00
Marc Alexander
11563ce971
[ticket/16870] Use string representation of float value for treshold
PHPBB3-16870
2021-09-08 20:42:41 +02:00
Marc Alexander
bbcac37e30
[ticket/16870] Ensure to properly escape values when running db:migrate
PHPBB3-16870
2021-09-08 20:24:44 +02:00
Marc Alexander
f78c4e8635
Merge branch '3.3.x' 2021-09-06 17:38:05 +02:00
Marc Alexander
4f2a09e71d
Merge pull request #6285 from marc1706/ticket/16867-master
[ticket/16867] Update symfony and text-formatter to latest versions -- master version
2021-09-06 17:38:00 +02:00
Marc Alexander
8c25f3a9f7
Merge pull request #6284 from marc1706/ticket/16867
[ticket/16867] Update symfony and text-formatter to latest versions
2021-09-06 17:37:38 +02:00
Marc Alexander
7a283553aa
Merge branch 'ticket/16867' into ticket/16867-master 2021-09-05 22:11:33 +02:00
Marc Alexander
e371f3eac7
[ticket/16867] Update symfony and text-formatter to latest versions
PHPBB3-16867
2021-09-05 22:08:06 +02:00
Máté Bartus
97bbae3224 Merge branch '3.3.x' 2021-09-03 10:31:50 +02:00
Máté Bartus
dc7012864b
Merge pull request #6282 from CHItA/ticket/16858
[ticket/16858] Fix coding style
2021-09-03 10:31:12 +02:00
Máté Bartus
cd53106ec3 [ticket/16858] Fix coding style
PHPBB3-16858
2021-09-03 09:58:34 +02:00
Máté Bartus
aa06580807 Merge branch '3.3.x' 2021-09-02 10:48:56 +02:00
Máté Bartus
86af3a2ba4
Merge pull request #6275 from marc1706/ticket/16856
[ticket/16856] Add lang_js twig function as replacement for LA_
2021-09-02 10:48:22 +02:00