1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-13 19:15:20 +02:00

33545 Commits

Author SHA1 Message Date
Marc Alexander
7e450a4728
Merge branch '3.3.x' 2019-12-21 10:26:00 +01:00
Marc Alexander
0b3eb2f9ea
Merge branch '3.2.x' into 3.3.x 2019-12-21 10:25:56 +01:00
Marc Alexander
1a9ab15f26
Merge pull request from KYPREO/ticket/16258
[ticket/16258] Fix sample Sphinx configuration file
2019-12-21 10:25:51 +01:00
Marc Alexander
c055a1d0ca
Merge branch '3.3.x' 2019-12-21 10:18:13 +01:00
Marc Alexander
581139ab15
Merge pull request from hanakin/ticket/16248
[ticket/16248] swap logo for new svg version
2019-12-21 10:15:53 +01:00
hanakin
8e54e5cc79 [ticket/16248] stupid lack of standards are stupid
PHPBB3-16248
2019-12-17 17:41:21 -08:00
hanakin
26c4dfb9d7 [ticket/16248] add quotes to lang
PHPBB3-16248
2019-12-17 15:35:15 -08:00
hanakin
fce796517b [ticket/16248] Convert to twig
PHPBB3-16248
2019-12-17 14:28:53 -08:00
KYPREO
d4681145dc [ticket/16258] Fix sample Sphinx configuration file
PHPBB3-16258
2019-12-17 21:01:06 +11:00
Marc Alexander
7934d3bd56
Merge branch '3.3.x' 2019-12-15 20:26:06 +01:00
Marc Alexander
bcc90133a8
Merge pull request from rxu/ticket/15294
[ticket/15294] Fix session_gc() selecting expired sessions for unique users
2019-12-15 20:26:01 +01:00
Marc Alexander
07b79ead80
Merge branch '3.3.x' 2019-12-15 20:14:27 +01:00
Marc Alexander
611b3c4e46
Merge pull request from SagePtr/ticket/16255
[ticket/16255] Fix PHP 7.4 deprecation warning
2019-12-15 20:14:22 +01:00
Marc Alexander
42292bb507
Merge branch '3.3.x' 2019-12-15 19:59:51 +01:00
Marc Alexander
ac43c5c8bd
Merge pull request from marc1706/ticket/16238-3.3.x
[ticket/16238] Update version for deprecation
2019-12-15 19:59:45 +01:00
Marc Alexander
b293f9a060
Merge branch '3.3.x' 2019-12-13 20:17:32 +01:00
Marc Alexander
b786dbc5d7
Merge branch '3.2.x' into 3.3.x 2019-12-13 20:17:17 +01:00
Marc Alexander
e32694920b
Merge pull request from marc1706/ticket/16224-master
[ticket/16224] Update composer dependencies - master version
2019-12-13 20:17:06 +01:00
Marc Alexander
0efeef46e1
Merge pull request from marc1706/ticket/16224-3.3.x
[ticket/16224] Update composer dependencies - 3.3.x version
2019-12-13 20:16:45 +01:00
Marc Alexander
4b890cff12
Merge pull request from marc1706/ticket/16224
[ticket/16224] Update composer dependencies - 3.2.x version
2019-12-13 20:16:13 +01:00
Sage Pointer
fd5ac318a5 [ticket/16255] Fix PHP 7.4 deprecation warning
PHPBB3-16255
2019-12-13 20:28:36 +02:00
Marc Alexander
581fe4ec83
[ticket/16238] Update version for deprecation
PHPBB3-16238
2019-12-12 18:41:52 +01:00
Marc Alexander
95f45ddf54
Merge branch '3.3.x' 2019-12-12 18:34:16 +01:00
Marc Alexander
02689df8f7
Merge pull request from AlfredoRamos/ticket/16235
[ticket/16235] Fix PHP CodeSniffer ignore patterns
2019-12-12 18:34:06 +01:00
Marc Alexander
94f85fee06
Merge branch '3.3.x' 2019-12-12 18:21:12 +01:00
Marc Alexander
d9749d5bb0
Merge branch '3.2.x' into 3.3.x 2019-12-12 18:20:56 +01:00
Marc Alexander
4b376de3bf
Merge pull request from JoshyPHP/ticket/16251
[ticket/16251] Prevent shortened links from overriding other plugins
2019-12-12 18:20:49 +01:00
Marc Alexander
7dbd6abe8e
Merge branch '3.3.x' 2019-12-12 18:17:06 +01:00
Marc Alexander
b7492a7b6f
Merge branch '3.2.x' into 3.3.x 2019-12-12 18:17:00 +01:00
Marc Alexander
4a950750f4
Merge pull request from JoshyPHP/ticket/16252
[ticket/16252] Ignore non-BBCodes when looking for unauthorized markup
2019-12-12 18:16:55 +01:00
Marc Alexander
d17c4a12e5
Merge branch 'ticket/16224-3.3.x' into ticket/16224-master 2019-12-12 18:16:11 +01:00
Marc Alexander
59afb76df4
Merge branch 'ticket/16224' into ticket/16224-3.3.x 2019-12-12 18:13:25 +01:00
Marc Alexander
e584ce4010
[ticket/16224] Update fast-image-size to 1.1.6
PHPBB3-16224
2019-12-12 18:02:38 +01:00
JoshyPHP
5813b5fbee [ticket/16252] Ignore non-BBCodes when looking for unauthorized markup
PHPBB3-16252
2019-12-09 18:06:30 +01:00
JoshyPHP
6758190afd [ticket/16251] Prevent shortened links from overriding other plugins
PHPBB3-16251
2019-12-09 02:16:01 +01:00
hanakin
d659276749 [ticket/16248] fix logo in acp
PHPBB3-16248
2019-12-08 00:07:57 -10:00
hanakin
8be1ad4568 [ticket/16248] loaaaad svg old way for BC
PHPBB3-16248
2019-12-07 08:20:59 -10:00
hanakin
0fc6fbf916 [ticket/16248] Remove all unused theme/images
PHPBB3-16248
2019-12-07 08:12:52 -10:00
hanakin
8ffbd66cba [ticket/16248] Swap out logos
PHPBB3-16248
2019-12-07 08:05:21 -10:00
hanakin
ff3458ff03 [ticket/16248] Add DS_Store to gitignore
PHPBB3-16248
2019-12-07 08:03:57 -10:00
Marc Alexander
e734b1aca0 Merge branch '3.3.x' 2019-12-06 08:31:58 +01:00
Marc Alexander
5be4cca408 Merge pull request from marc1706/ticket/16226
[ticket/16226] Prevent Apache servers from using MultiViews
2019-12-06 08:31:53 +01:00
Marc Alexander
e51683511a Merge branch '3.3.x' 2019-12-06 07:22:52 +01:00
Marc Alexander
3009e7ffbe Merge branch '3.2.x' into 3.3.x 2019-12-06 07:20:34 +01:00
Marc Alexander
1f00e160ab Merge pull request from marc1706/ticket/16211
[ticket/16211] Prevent skipping COPPA via URL parameter
2019-12-06 07:20:30 +01:00
Marc Alexander
1a50719e4c Merge branch '3.3.x' 2019-12-06 07:12:50 +01:00
Marc Alexander
d7425b4998 Merge pull request from mrgoldy/ticket/16239
[ticket/16239] Remove deprecated phpbb\db\tools
2019-12-06 07:12:46 +01:00
Marc Alexander
2c8e6e400c Merge branch '3.3.x' 2019-12-06 07:03:39 +01:00
Marc Alexander
186384e514 Merge branch '3.2.x' into 3.3.x 2019-12-06 07:03:35 +01:00
Marc Alexander
41918b8afa Merge pull request from 3D-I/ticket/16247
[ticket/16247] Quote PM has no identifier
2019-12-06 07:03:30 +01:00