Commit graph

33474 commits

Author SHA1 Message Date
Marc Alexander
ad282f09a0
Merge branch '3.3.x' 2019-12-04 21:11:45 +01:00
Marc Alexander
f9a364074d
Merge branch '3.2.x' into 3.3.x 2019-12-04 21:11:40 +01:00
Marc Alexander
3002cee42a
Merge pull request #5761 from AlfredoRamos/ticket/16242
[ticket/16242] Fix nginx redirection loop
2019-12-04 21:11:35 +01:00
Marc Alexander
5f836b7fee
Merge branch '3.3.x' 2019-12-04 20:50:15 +01:00
Marc Alexander
cb0f4790ae
Merge branch '3.2.x' into 3.3.x 2019-12-04 20:49:54 +01:00
Marc Alexander
6be6b69110
Merge pull request #5764 from VSEphpbb/ticket/16246
[ticket/16246] Update automated testing section of Readme
2019-12-04 20:49:06 +01:00
Marc Alexander
223f8aad5a
Merge branch '3.3.x' 2019-12-04 20:12:49 +01:00
Marc Alexander
5ef225381d
Merge pull request #5752 from rxu/ticket/16236
[ticket/16236] Bump phpBB 3.3 max PHP version requirement to PHP 7.4
2019-12-04 20:11:18 +01:00
Matt Friedman
1056cd9ca2 [ticket/16246] Update automated testing section of Readme
PHPBB3-16246
2019-12-03 22:21:11 -08:00
Alfredo Ramos
9c980256bf [ticket/16242] Fix nginx redirection loop
PHPBB3-16242
2019-12-03 01:43:44 -06:00
Marc Alexander
cda0d62c12
Merge branch '3.3.x' 2019-12-01 11:36:30 +01:00
Marc Alexander
8b4892b96b
Merge pull request #5758 from VSEphpbb/ticket/16241
[ticket/16241] Color Palette backwards compatibility
2019-12-01 11:36:25 +01:00
Marc Alexander
8ee56d73d8
Merge pull request #5545 from mrgoldy/ticket/15538
[ticket/15538] Twig icon function
2019-12-01 11:35:01 +01:00
Matt Friedman
68326c6aa1 [ticket/16241] Color Palette backwards compatibility
PHPBB3-16241
2019-11-30 09:17:08 -08:00
mrgoldy
811fbbeb92 [ticket/15538] Allow array of icons: icon_name => boolean
PHPBB3-15538
2019-11-30 15:55:21 +01:00
mrgoldy
23a2c0c9c7 [ticket/15538] 404 SVG and viewBox
PHPBB3-15538
2019-11-30 15:01:25 +01:00
mrgoldy
c47f9d5744 [ticket/15538] Drop templates and icons folder, twig file extension
PHPBB3-15538
2019-11-30 13:22:11 +01:00
rxu
6d71748e9a
[ticket/16236] Bump phpBB 3.3 max PHP version requirement to PHP 7.4
PHPBB3-16236
2019-11-29 23:00:05 +07:00
Marc Alexander
0a01b3bcc8
Merge branch '3.3.x' 2019-11-28 21:39:50 +01:00
Marc Alexander
5d5c3481b7
Merge branch '3.2.x' into 3.3.x 2019-11-28 21:39:45 +01:00
Marc Alexander
d48e0f7f13
Merge pull request #5730 from 3D-I/ticket/16203
[ticket/16203] Enable Emojis and rich text in sent Emails
2019-11-28 21:39:40 +01:00
Marc Alexander
c89c8c92cd
Merge branch '3.3.x' 2019-11-28 21:24:47 +01:00
Marc Alexander
3837d2cfee
Merge pull request #5749 from 3D-I/ticket/16227
[ticket/16227] Fix undefined vars on login
2019-11-28 21:24:42 +01:00
Marc Alexander
f547024751
Merge branch '3.3.x' 2019-11-28 21:11:54 +01:00
Marc Alexander
ac6676a144
Merge branch '3.2.x' into 3.3.x 2019-11-28 21:11:48 +01:00
Marc Alexander
03e15166c7
Merge pull request #5747 from JoshyPHP/ticket/16228
[ticket/16228] Fix BBCodes merging
2019-11-28 21:11:43 +01:00
Marc Alexander
c6a354e59c
Merge branch '3.3.x' 2019-11-28 20:46:12 +01:00
Marc Alexander
3986273fdb
Merge pull request #5750 from mrgoldy/ticket/12539
[ticket/12539] Rebind live member search navigation
2019-11-28 20:46:07 +01:00
mrgoldy
ac2b95c1fa [ticket/15538] Update 404 source path to all/imgs
PHPBB3-15538
2019-11-27 21:01:29 +01:00
Marc Alexander
f26c79621b Merge branch '3.3.x' 2019-11-27 08:10:49 +01:00
Marc Alexander
cbbba2dcc7 Merge pull request #5745 from marc1706/ticket/16223
[ticket/16223] Remove no longer supported memcache driver
2019-11-27 08:10:44 +01:00
mrgoldy
6b7d9af0c2 [ticket/12539] Rebind live member search navigation
PHPBB3-12539
2019-11-26 16:36:56 +01:00
mrgoldy
5a1be4611c [ticket/15538] Style inheritance for PNG and a default 'no icon'
PHPBB3-15538
2019-11-26 15:17:47 +01:00
rubencm
5ed02c2149 [ticket/16223] Use register_php_extension instead of echo
PHPBB3-16223
2019-11-26 08:40:05 +01:00
3D-I
3be57cea04 [ticket/16227] Fix undefined vars on login
PHPBB3-16227
2019-11-25 23:09:37 +01:00
Marc Alexander
dac910d27a
[ticket/16223] Do not use install_php_extension for memcached
PHPBB3-16223
2019-11-25 22:19:03 +01:00
Marc Alexander
380b7d0a98
[ticket/16223] Use constructor arguments instead of func_get_args()
PHPBB3-16223
2019-11-25 22:16:41 +01:00
Marc Alexander
bc045fd19b
[ticket/16223] Use install_php_extensions for installing memcached
PHPBB3-16223
2019-11-25 22:04:24 +01:00
Marc Alexander
c37e696c1c
[ticket/16223] Add memcached config and PHP extension
PHPBB3-16223
2019-11-25 21:33:42 +01:00
Marc Alexander
c7d47e34e8
[ticket/16223] Ensure memcached tests are only run when available
PHPBB3-16223
2019-11-25 21:27:43 +01:00
Marc Alexander
fd7524858c
[ticket/16223] Add test for memcached driver
PHPBB3-16223
2019-11-25 20:10:12 +01:00
JoshyPHP
d6f5b5ef6c [ticket/16228] Fix BBCodes merging
PHPBB3-16228
2019-11-25 18:34:04 +01:00
Marc Alexander
86085f96ab
[ticket/16223] Remove no longer supported memcache driver
PHPBB3-16223
2019-11-24 16:54:57 +01:00
Marc Alexander
bf6bcad1cb
Merge branch '3.3.x' 2019-11-23 14:28:28 +01:00
Marc Alexander
a8e2f4256b
[3.3.x] Update version numbers to 3.3.0-rc1-dev 2019-11-23 14:25:53 +01:00
Marc Alexander
8b7e0563a5
Merge branch 'prep-release-3.3.0-b2' into 3.3.x 2019-11-23 14:23:39 +01:00
Marc Alexander
75b12e7c75
Merge branch '3.3.x' 2019-11-22 19:16:09 +01:00
Marc Alexander
3e9c2ea025
Merge branch '3.2.x' into 3.3.x 2019-11-22 19:15:44 +01:00
Marc Alexander
bf96786cda
Merge pull request #5741 from marc1706/ticket/16217
[ticket/16217] Enable opcache on travis tests again
2019-11-22 19:15:03 +01:00
Marc Alexander
20550a4610
Merge branch '3.3.x' 2019-11-22 19:12:11 +01:00