1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 10:31:57 +02:00
Commit Graph

28408 Commits

Author SHA1 Message Date
Marc Alexander
720e489df6 Merge branch 'ticket/16224-3.3.x' into ticket/16224-master 2019-12-04 20:41:34 +01:00
Marc Alexander
f26e83e4c6 Merge branch 'ticket/16224' into ticket/16224-3.3.x 2019-12-04 20:39:38 +01:00
Marc Alexander
37ccd29558 [ticket/16224] Update composer dependencies
PHPBB3-16224
2019-12-04 20:31:28 +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
Marc Alexander
cda0d62c12 Merge branch '3.3.x' 2019-12-01 11:36:30 +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
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
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
3D-I
3be57cea04 [ticket/16227] Fix undefined vars on login
PHPBB3-16227
2019-11-25 23:09:37 +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
c7d47e34e8 [ticket/16223] Ensure memcached tests are only run when available
PHPBB3-16223
2019-11-25 21:27:43 +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
77a15e3542 [prep-release-3.3.0-b2] Update changelog for 3.3.0-b2 2019-11-22 11:08:11 +01:00
Marc Alexander
d55e421c0f [prep-release-3.3.0-b2] Add migration for 3.3.0-b2 2019-11-22 11:06:15 +01:00
Marc Alexander
db1040ec69 [prep-release-3.3.0-b2] Update version numbers to 3.3.0-b2 2019-11-22 11:04:32 +01:00
Marc Alexander
251473700a [prep-release-3.3.0-b2] Update version numbers to 3.3.0-b2 2019-11-22 11:03:07 +01:00
Marc Alexander
0e0659cf34 Merge branch '3.3.x' 2019-11-22 10:56:37 +01:00
Marc Alexander
896b31272b Merge pull request #5686 from v12mike/ticket/9837
[ticket/9837] Display unapproved posts to their authors
2019-11-22 10:56:33 +01:00
Marc Alexander
0a4cc5d201 [ticket/9837] Apply suggested changes by CHItA
PHPBB3-9837
2019-11-22 09:20:18 +01:00
Marc Alexander
b6ec8c8a94 Merge branch '3.3.x' 2019-11-21 14:55:37 +01:00
v12mike
29be971fad [ticket/9837] Make unapproved posts visible to author
review comments

PHPBB3-9837
2019-11-21 13:44:22 +01:00
v12mike
0f57f3d90d [ticket/9837] Display unapproved posts to their authors
Coding guidelines fixes

PHPBB3-9837
2019-11-21 13:44:22 +01:00
v12mike
4d15683733 [ticket/9837] Display unapproved posts to their authors
Clarification of comment

PHPBB3-9837
2019-11-21 13:44:22 +01:00
v12mike
8726baea9f [ticket/9837] Display unapproved posts to their authors
Change code order to improve efficiency.

PHPBB3-9837
2019-11-21 13:44:22 +01:00
v12mike
15da5b108e [ticket/9837] Display unapproved posts to their authors
Re-order code for efficiency

PHPBB3-9837
2019-11-21 13:44:21 +01:00
v12mike
63ebd658a9 [ticket/9837] Display unapproved posts to their authors
Improve ACP language strings

PHPBB3-9837
2019-11-21 13:44:21 +01:00
v12mike
9fff4cf253 [ticket/9837] Make unapproved posts visible to posters
Add tests
Tidy up code
Improve user message formatting

PHPBB3-9837
2019-11-21 13:44:21 +01:00
v12mike
1f10cd51ff [ticket/9837] Display unapproved posts to posters
Add tests and improve style template

PHPBB3-9837
2019-11-21 13:44:21 +01:00
Máté Bartus
e39753083d [ticket/9837] Small fixes
PHPBB3-9837
2019-11-21 13:44:21 +01:00
Máté Bartus
3149b45eba [ticket/9837] Display unapproved posts to their authors
Basic functionality mock up.

PHPBB3-9837
2019-11-21 13:44:20 +01:00