1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 10:44:20 +02:00
Commit Graph

33674 Commits

Author SHA1 Message Date
Marc Alexander
dcf1449de7 Merge branch '3.3.x' 2020-01-01 17:35:00 +01:00
Marc Alexander
1ae812d172 Merge branch '3.2.x' into 3.3.x 2020-01-01 17:34:44 +01:00
Marc Alexander
dd93bb1aad Merge pull request #5804 from marc1706/ticket/16282-3.3
[ticket/16282] Adjust jQuery cdn url in schema_data
2020-01-01 17:34:13 +01:00
Marc Alexander
bf58fafd76 Merge branch 'prep-release-3.2.9' into 3.2.x 2020-01-01 17:33:39 +01:00
Marc Alexander
693d008851 Merge pull request #5803 from marc1706/ticket/16282
[ticket/16282] Adjust jQuery cdn url in schema_data
2020-01-01 17:33:07 +01:00
Marc Alexander
da650a53b6 Merge branch '3.3.x' 2020-01-01 17:28:33 +01:00
Marc Alexander
737155a43a Merge branch '3.2.x' into 3.3.x 2020-01-01 17:27:58 +01:00
Marc Alexander
53b3b1bb40 Merge branch 'prep-release-3.2.9' into 3.2.x 2020-01-01 17:27:31 +01:00
Marc Alexander
97e9357153 Merge branch 'ticket/15592' into prep-release-3.2.9 2020-01-01 17:26:38 +01:00
Marc Alexander
706a10d4cf Merge pull request #5792 from KYPREO/ticket/16269
[ticket/16269] Strip HTML markup from Sphinx search index
2020-01-01 17:26:10 +01:00
Alfredo Ramos
ec694bf8bd [ticket/15592] Fix attachments place inline button if BBCode is disabled
PHPBB3-15592
2020-01-01 17:24:57 +01:00
Marc Alexander
136345e0b1 Merge branch '3.3.x' 2020-01-01 16:49:43 +01:00
Marc Alexander
372a3bfcde Merge branch '3.2.x' into 3.3.x 2020-01-01 16:47:40 +01:00
Marc Alexander
cfdc1ef62a Merge pull request #5799 from AlfredoRamos/ticket/15592
[ticket/15592] Fix attachments place inline button if BBCode is disabled
2020-01-01 16:47:34 +01:00
Marc Alexander
a0e2fa9a45 Merge branch '3.3.x' 2020-01-01 16:35:46 +01:00
Marc Alexander
7ae7502146 Merge pull request #5798 from rxu/ticket/16277
[ticket/16277] Move from each() function
2020-01-01 16:35:42 +01:00
Marc Alexander
14e3eb2d0e Merge branch '3.3.x' 2020-01-01 16:25:15 +01:00
Marc Alexander
7a294b5fcd Merge pull request #5795 from 3D-I/ticket/16274
[ticket/16274] Fix compact() call to undefined variables in search.php
2020-01-01 16:25:11 +01:00
rxu
374dc92e8f [ticket/16277] Adjust patch for the diff engine
PHPBB3-16277
2020-01-01 04:07:11 +07:00
Marc Alexander
3c91126806 [ticket/16282] Adjust jQuery cdn url in schema_data
PHPBB3-16282
2019-12-31 16:41:58 +01:00
Marc Alexander
803ed6050f [ticket/16282] Adjust jQuery cdn url in schema_data
PHPBB3-16282
2019-12-31 16:40:20 +01:00
Marc Alexander
9e7f75a124 Merge branch '3.3.x' 2019-12-30 12:32:36 +01:00
Marc Alexander
6ee537b3f2 Merge pull request #5800 from marc1706/ticket/16278
[ticket/16278] Clearly state config.php exception and update INSTALL.html
2019-12-30 12:32:30 +01:00
Marc Alexander
0712b7746d Merge branch '3.3.x' 2019-12-30 12:19:08 +01:00
Marc Alexander
f3a9301483 Merge branch '3.2.x' into 3.3.x 2019-12-30 12:19:02 +01:00
Marc Alexander
5aba63d5aa Merge pull request #5792 from KYPREO/ticket/16269
[ticket/16269] Strip HTML markup from Sphinx search index
2019-12-30 12:18:52 +01:00
Marc Alexander
a3276c3ffe [ticket/16274] Fix feed event referring to undefined variables
PHPBB3-16274
2019-12-30 11:46:52 +01:00
3D-I
4956dc3197 [ticket/16274] Fix compact() call to undefined variables in search.php
PHPBB3-16274
2019-12-30 08:47:23 +01:00
Marc Alexander
5ffb6b34fc Merge branch '3.3.x' 2019-12-30 08:37:14 +01:00
Marc Alexander
b1c5ad6a61 Merge pull request #5783 from brunoais/ticket/16262
Ticket/16262 compact() calls with undefined variables causing error page
2019-12-30 08:37:08 +01:00
Marc Alexander
74a747d455 [ticket/16278] Clearly state config.php exception and update INSTALL.html
A few typos and not fully up to date information has been updated.

PHPBB3-16278
2019-12-29 21:54:33 +01:00
Marc Alexander
d0707105c7 Merge branch '3.3.x' 2019-12-29 21:43:12 +01:00
Marc Alexander
036871cd95 Merge pull request #5790 from rxu/ticket/16266
[ticket/16266] Fix argon2 driver issue for Sodium implementation
2019-12-29 21:43:06 +01:00
Alfredo Ramos
580126cff3 [ticket/15592] Fix attachments place inline button if BBCode is disabled
PHPBB3-15592
2019-12-29 11:58:38 -06:00
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
rxu
80de9f6a68 [ticket/16277] Move from each() function
PHPBB3-16277
2019-12-29 18:56:36 +07:00
Marc Alexander
56476ed7ee [ticket/16271] Fix sami parse errors in master
PHPBB3-16271
2019-12-29 11:01:10 +01:00
rxu
c71d4c364a [ticket/16266] Prevent "Use of undefined constant" warning in tests
PHPBB3-16266
2019-12-29 16:09:17 +07: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
rxu
37fddf8eef [ticket/16266] Fix tests
PHPBB3-16266
2019-12-28 23:55:31 +07:00
rxu
3669849368 [ticket/16266] Refactor patch using argon2 predefined constants
PHPBB3-16266
2019-12-28 12:20:51 +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
rxu
d000717d34 [ticket/16266] More code optimizing
PHPBB3-16266
2019-12-28 02:11:58 +07: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
rxu
a750372a03 [ticket/16266] More code optimizing
PHPBB3-16266
2019-12-28 01:04:13 +07:00