Commit graph

594 commits

Author SHA1 Message Date
Marc Alexander
93a940c78f
Merge branch '3.3.x' 2021-05-28 07:25:03 +02:00
Marc Alexander
37ebf41308
Merge pull request #5274 from rubencm/ticket/14285
[ticket/14285] Move downloads to controller
2021-05-28 07:17:15 +02:00
Marc Alexander
32586407d1
[ticket/16785] Use correct versions in build.xml for 3.3.x branch
PHPBB3-16785
2021-05-27 22:36:33 +02:00
rubencm
551004a209 [ticket/14285] Fix code sniffer
PHPBB3-14285
2021-05-27 09:00:59 +02:00
Marc Alexander
cbff1d48dc
Merge branch '3.3.x' 2021-05-01 21:52:12 +02:00
Marc Alexander
ecc79ea2ec
Merge branch 'prep-release-3.3.4' into 3.3.x 2021-05-01 21:51:16 +02:00
Marc Alexander
f861f1fb9a
[prep-release-3.3.4] Update version numbers to 3.3.4 2021-04-27 21:19:36 +02:00
Máté Bartus
5d1bddbf71 Merge branch '3.3.x' 2021-04-22 08:56:58 +02:00
William Desportes
8c334f0c10
[ticket/16754] Update Doctum to 5.4.1
PHPBB3-16754
2021-04-22 02:03:21 +02:00
Marc Alexander
ce08da5165
[ticket/16748] Enable code sniffing for static placement and adjust code
PHPBB3-16748
2021-04-03 23:12:04 +02:00
Marc Alexander
8518393c46
Merge branch 'ticket/16748' into ticket/16748-master 2021-04-03 22:44:04 +02:00
Marc Alexander
95496ebd38
[ticket/16748] Adjust coding guidelines to put static after visibility
PHPBB3-16748
2021-04-03 22:41:58 +02:00
Marc Alexander
020d574816
Merge branch '3.3.x' 2021-03-24 21:31:27 +01:00
Marc Alexander
7d48254cc9
Merge pull request #6163 from marc1706/ticket/16730
[ticket/16730] Don't do additional sorting or output without any tickets
2021-03-24 21:31:22 +01:00
Máté Bartus
46d2a93ae6 Merge branch '3.3.x' 2021-03-23 23:45:45 +01:00
Marc Alexander
0897d3e381
[ticket/16736] Add sniffer for visibilitiy qualifiers before static keyword
PHPBB3-16736
2021-03-23 22:09:05 +01:00
Marc Alexander
4721007c02
[ticket/16730] Don't do additional sorting or output without any tickets
PHPBB3-16730
2021-03-17 21:36:53 +01:00
Marc Alexander
8f2d84f4dc
[3.3.x] Update versions to 3.3.5-dev 2021-03-16 20:16:25 +01:00
Marc Alexander
b45bd3ace7
[prep-release-3.3.4] Update version numbers to 3.3.4-RC1 2021-03-15 21:47:29 +01:00
Marc Alexander
b46e242013
Merge branch 'ticket/15392' into ticket/15392-master 2021-03-04 17:04:17 +01:00
DinHere
8c9d26db1f
[ticket/15392] Changed dirname(__FILE__) to __DIR__
Changed dirname(__FILE__) to __DIR__ everywhere

PHPBB3-15392
2021-03-03 22:24:10 +01:00
Marc Alexander
0f3ea6991d
Merge branch '3.3.x' 2021-01-29 20:16:15 +01:00
Marc Alexander
0602fa2316
Merge branch 'prep-release-3.3.3' into 3.3.x 2021-01-29 20:15:16 +01:00
Marc Alexander
9cf8bd25cb
[prep-release-3.3.3] Update version numbers to 3.3.3 2021-01-25 22:05:42 +01:00
Máté Bartus
29e7226c96 Merge branch '3.3.x' 2021-01-22 19:14:53 +01:00
rxu
2fd4dbb685
[ticket/16690] Fix htmlspecialchars and htmlspecialchars_decode default flag
PHPBB3-16690
2021-01-20 00:21:24 +07:00
Marc Alexander
422cf5493f
Merge branch '3.3.x' 2021-01-14 17:19:03 +01:00
Marc Alexander
57e2a32d4c
[3.3.x] Update version numbers to 3.3.4-dev 2021-01-14 17:12:07 +01:00
Marc Alexander
7d3ff8c7f2
[prep-release-3.3.3] Update version numbers to 3.3.3-RC1 2021-01-11 21:21:43 +01:00
Marc Alexander
16d48a5e08
Merge branch '3.3.x' 2021-01-05 22:12:35 +01:00
Máté Bartus
7e1529c7df [ticket/16678] Allow using traits
PHPBB3-16678
2021-01-05 18:21:30 +01:00
Máté Bartus
864321ecf6 Merge branch '3.3.x' 2021-01-03 00:11:11 +01:00
Máté Bartus
0208dbf985 [ticket/16671] Allow importing functions through use statements
PHPBB3-16671
2021-01-01 11:46:23 +01:00
Máté Bartus
fd8cb2a0e8 [ticket/16671] Allow using objects from the global namespace
PHPBB3-16671
2020-12-31 15:22:50 +01:00
Máté Bartus
3d8f7ee33b [ticket/16671] Do not allow leading backslashes in use statements
PHPBB3-16671
2020-12-31 14:49:49 +01:00
Máté Bartus
cb894cee42 [ticket/16671] Match fully qualified names correctly
PHPBB3-16671
2020-12-31 14:39:11 +01:00
Marc Alexander
b445b95e3a
Merge branch '3.3.x' 2020-11-06 17:07:56 +01:00
Marc Alexander
39c3a6c3e5
Merge branch 'prep-release-3.3.2' into 3.3.x 2020-11-06 17:06:22 +01:00
Marc Alexander
c521f1d6a7
[prep-release-3.3.2] Update version numbers for 3.3.2 2020-11-04 22:09:55 +01:00
Marc Alexander
17104fde04
Merge branch 'prep-release-3.2.11' into prep-release-3.3.2 2020-11-04 22:08:26 +01:00
Marc Alexander
a4a31a36ce
Merge branch '3.3.x' 2020-11-04 22:05:43 +01:00
Marc Alexander
2f14cc832c
Merge branch '3.2.x' into 3.3.x 2020-11-04 22:05:11 +01:00
Marc Alexander
adcbe0a2b1
[prep-release-3.2.11] Update versions for 3.2.11 2020-11-04 16:35:22 +01:00
Marc Alexander
32224a9d5a
Merge branch '3.3.x' 2020-10-24 10:42:00 +02:00
Marc Alexander
dd7a184926
[3.3.x] Update version numbers to 3.3.3-dev 2020-10-24 10:39:11 +02:00
Marc Alexander
7716961f07
[prep-release-3.3.2] Update version number to 3.3.2-RC1 2020-10-18 13:54:02 +02:00
Marc Alexander
46bd456825
Merge branch '3.3.x' 2020-09-13 20:35:34 +02:00
Marc Alexander
0d2e9455aa
[ticket/16597] Stop building docs with sami for 3.3 and above
PHPBB3-16597
2020-09-11 19:31:43 +02:00
Marc Alexander
8bd35d47ad
[ticket/16597] Remove not supported branches from doctum-all.conf.php
PHPBB3-16597
2020-09-11 10:43:57 +02:00
Marc Alexander
17c4fe6f9e
Merge branch '3.3.x' 2020-09-08 20:41:52 +02:00