1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-23 17:10:53 +01:00

33628 Commits

Author SHA1 Message Date
Marc Alexander
9ea5cfd14b
Merge branch '3.3.x' 2019-12-29 15:11:29 +01:00
Marc Alexander
71a1c9fee7
Merge pull request #5796 from rxu/ticket/16276
[ticket/16276] Fix bbcode_firstpass undefined mode property
2019-12-29 15:11:23 +01:00
Marc Alexander
bfaeabe9e5
Merge pull request #5797 from marc1706/ticket/16271
[ticket/16271] Fix sami parse errors in master
2019-12-29 15:08:35 +01:00
Marc Alexander
56476ed7ee
[ticket/16271] Fix sami parse errors in master
PHPBB3-16271
2019-12-29 11:01:10 +01:00
rxu
dcab076221
[ticket/16276] Further fix PHP nightly tests
PHPBB3-16276
2019-12-29 12:59:24 +07:00
Marc Alexander
224b8d5494
Merge branch '3.3.x' 2019-12-28 21:44:48 +01:00
Marc Alexander
94808e2cbc
Merge pull request #5794 from 3D-I/ticket/16273
[ticket/16273] Check whether the index exists in memberlist - PHP 7.4
2019-12-28 21:41:32 +01:00
rxu
82e61f501a
[ticket/16276] Fix bbcode_firstpass undefined mode property
PHPBB3-16276
2019-12-29 01:51:15 +07:00
3D-I
ebf7e9f45f [ticket/16273] Check whether the index exists in memberlist - PHP 7.4
Cast to bool

PHPBB3-16273
2019-12-28 01:47:43 +01:00
3D-I
d191eed760 [ticket/16273] Check whether the index exists in memberlist - PHP 7.4
PHPBB3-16273
2019-12-27 19:43:32 +01:00
Marc Alexander
72747ed686
Merge pull request #5793 from marc1706/ticket/16271
[ticket/16271] Add Sami 4.x and update necessary dependencies
2019-12-27 15:49:41 +01:00
Marc Alexander
b0cd269d2a
Merge branch '3.3.x' 2019-12-27 15:47:23 +01:00
Marc Alexander
c7898ac3e4
Merge pull request #5788 from 3D-I/ticket/16221
[ticket/16221] Fix ACP statistics layout
2019-12-27 15:47:18 +01:00
Marc Alexander
6dee1439e7
Merge branch '3.3.x' 2019-12-27 15:06:05 +01:00
Marc Alexander
c70d024f5f
Merge pull request #5787 from 3D-I/ticket/16267
[ticket/16267] Check whether the index exists in ACP BBcodes - PHP 7.4
2019-12-27 15:06:01 +01:00
Marc Alexander
7cf148ea13
[ticket/16271] Fix invalid docblocks
PHPBB3-16271
2019-12-27 14:58:42 +01:00
Marc Alexander
41f287fbea
[ticket/16271] Add Sami 4.x and update necessary dependencies
PHPBB3-16271
2019-12-27 13:54:46 +01:00
Marc Alexander
09279b81d4
Merge branch '3.3.x' 2019-12-27 08:28:20 +01:00
Marc Alexander
3ae799f4de
Merge branch '3.2.x' into 3.3.x 2019-12-27 08:28:15 +01:00
Marc Alexander
3e5090e792
Merge pull request #5791 from marc1706/ticket/16271
[ticket/16271] Enable support for 3.3.x API documentation
2019-12-27 08:28:10 +01:00
Marc Alexander
8bcff3ac74
[ticket/16271] Enable support for 3.3.x API documentation
PHPBB3-16271
2019-12-26 23:00:29 +01:00
Marc Alexander
722ef54295
Merge branch '3.3.x' 2019-12-26 11:42:12 +01:00
Marc Alexander
230472de45
Merge branch '3.2.x' into 3.3.x 2019-12-26 11:39:58 +01:00
Marc Alexander
790e77de01
[3.2.x] Update version numbers to 3.2.10-dev 2019-12-26 11:32:36 +01:00
Marc Alexander
7286532656
Merge branch 'prep-release-3.2.9' into 3.2.x 2019-12-26 11:31:00 +01:00
3D-I
b85c7be5ac [ticket/16221] Fix ACP statistics layout
Fix wide-screen layout

PHPBB3-16221
2019-12-25 21:12:59 +01:00
3D-I
5eae76b209 [ticket/16267] Check whether the index exists in ACP BBcodes - PHP 7.4
PHPBB3-16267
2019-12-25 18:35:58 +01:00
Marc Alexander
7d90f84306
[prep-release-3.2.9] Add changelog for 3.2.9-RC1 release-3.2.9-RC1 2019-12-25 17:57:31 +01:00
Marc Alexander
3e4f18bed2
[prep-release-3.2.9] Update composer dependencies to latest 2019-12-25 17:56:09 +01:00
Marc Alexander
e31da34324
[prep-release-3.2.9] Add migration for 3.2.9-RC1 2019-12-25 17:55:06 +01:00
Marc Alexander
6c85564cc1
[prep-release-3.2.9] Update version numbers to 3.2.9 2019-12-25 17:53:09 +01:00
Marc Alexander
8cfe6a900c
[prep-release-3.2.9] Update version number to 3.2.9-RC1 2019-12-25 17:52:25 +01:00
Marc Alexander
acef860d56
Merge branch '3.3.x' 2019-12-25 17:41:04 +01:00
Marc Alexander
2ebbcbe233
Merge branch '3.2.x' into 3.3.x 2019-12-25 17:40:59 +01:00
Marc Alexander
4e2e36df60
Merge pull request #5564 from xchwarze/PHPBB3-16015
[ticket/16015] Add new hook core.ucp_profile_avatar_upload_validation
2019-12-25 17:40:54 +01:00
Marc Alexander
4bee15d0fa
[ticket/16015] Adjust since version
PHPBB3-16015
2019-12-25 14:36:33 +01:00
3D-I
b1596ffecb [ticket/16221] Fix ACP statistics layout
Resolve conflicts

PHPBB3-16221
2019-12-25 00:06:37 +01:00
3D-I
b9fccc9fce [ticket/16221] Fix ACP statistics layout
PHPBB3-16221
2019-12-24 23:53:48 +01:00
3D-I
9345bc1610 [ticket/16221] Fix ACP statistics layout
PHPBB3-16221
2019-12-24 23:38:35 +01:00
Marc Alexander
c9a4e7b917
Merge branch '3.3.x' 2019-12-24 22:58:17 +01:00
Marc Alexander
78ae67ae28
Merge branch '3.2.x' into 3.3.x 2019-12-24 22:58:13 +01:00
Marc Alexander
e880d2c12a
Merge pull request #5786 from marc1706/ticket/16209
[ticket/16209] Match exactly "phpbb" in nginx example configuration file
2019-12-24 22:58:07 +01:00
3D-I
044d327818 [ticket/16267] Check whether the index exists in ACP BBcodes - PHP 7.4
PHPBB3-16267
2019-12-24 21:51:15 +01:00
Marc Alexander
04c2b3784c
Merge branch '3.3.x' 2019-12-24 16:20:14 +01:00
Marc Alexander
cc9b29488f
Merge branch '3.2.x' into 3.3.x 2019-12-24 16:20:09 +01:00
Marc Alexander
8fe5063a35
Merge pull request #5784 from 3D-I/ticket/15902
[ticket/15902] Out of range error with Sphinx search
2019-12-24 16:20:04 +01:00
Marc Alexander
6f9e83eae9
Merge branch '3.3.x' 2019-12-24 16:15:12 +01:00
Marc Alexander
843887fcb9
Merge branch '3.2.x' into 3.3.x 2019-12-24 16:15:07 +01:00
Marc Alexander
91a60f871a
Merge pull request #5785 from 3D-I/ticket/16257
[ticket/16257] Typo in SMTP_SERVER_EXPLAIN
2019-12-24 16:15:02 +01:00
Alfredo Ramos
225c313bb3
[ticket/16209] Match exactly "phpbb" in nginx example configuration file
It blocks an image in the ACP.

PHPBB3-16209
2019-12-24 15:55:53 +01:00