Commit graph

32551 commits

Author SHA1 Message Date
Marc Alexander
4094d62613
Merge branch '3.2.x' into 3.3.x 2020-01-25 15:35:34 +01:00
Marc Alexander
ceaf6fcffe
Merge pull request #5837 from 3D-I/ticket/16337
[ticket/16337] Fix Emoji in BBcode Helpline
2020-01-25 15:35:29 +01:00
3D-I
e72ae0a4b2 [ticket/16339] Fix Poll's voting options refresh
PHPBB3-16339
2020-01-25 02:11:40 +01:00
Marc Alexander
28620b7d93
Merge branch '3.2.x' into 3.3.x 2020-01-24 16:45:36 +01:00
Marc Alexander
65cfd74b98
Merge pull request #5836 from 3D-I/ticket/16316
[ticket/16316] Fix breadcrumbs markup validation
2020-01-24 16:34:44 +01:00
3D-I
11e2cd925b [ticket/16337] Fix Emoji in BBcode Helpline
PHPBB3-16337
2020-01-24 04:46:57 +01:00
3D-I
f7797b89ed [ticket/16337] Fix Emoji in BBcode Helpline
PHPBB3-16337
2020-01-24 04:38:01 +01:00
3D-I
7d80314235 [ticket/16337] Fix Emoji in BBcode Helpline
PHPBB3-16337
2020-01-24 02:55:12 +01:00
3D-I
3d9845ebed [ticket/16316] Fix breadcrumbs markup validation
PHPBB3-16316
2020-01-24 00:21:50 +01:00
Marc Alexander
b3d07e26fc
Merge pull request #5822 from rxu/ticket/16307
[ticket/16307] Fix SQL time reporting when debug.sql_explain parameter is set
2020-01-22 21:22:38 +01:00
Marc Alexander
9b12a923f5
Merge branch '3.2.x' into 3.3.x 2020-01-22 21:21:07 +01:00
Marc Alexander
eff3b08d49
Merge pull request #5833 from mrgoldy/ticket/16332
[ticket/16332] Code and Quote language strings globally available
2020-01-22 21:21:01 +01:00
KYPREO
1f22248965 Merge branch '3.2.x' into ticket/16329 2020-01-22 20:24:47 +11:00
KYPREO
68677b8525 [ticket/16329] Add configuration options for Plupload
PHPBB3-16329
PHPBB3-16330
2020-01-22 20:21:12 +11:00
3D-I
8e538eebc5 [ticket/16316] Fix breadcrumbs markup validation
PHPBB3-16316
2020-01-21 22:48:20 +01:00
mrgoldy
5bc7723feb [ticket/16332] Amend formatting tests to expect translated code string
PHPBB3-16332
2020-01-21 17:43:11 +01:00
mrgoldy
18e75202d7 [ticket/15766] Use proper variable name for permission set
PHPBB3-15766
2020-01-21 17:27:03 +01:00
mrgoldy
11cf09b41a [ticket/15766] Check for role on changing permission settings
PHPBB3-15766
2020-01-21 17:25:27 +01:00
mrgoldy
908d04d0e8 [ticket/15370] Loading indicator when submitting permissions
PHPBB3-15370
2020-01-21 15:27:28 +01:00
mrgoldy
e7c028eed6 [ticket/16332] Code and Quote language strings globally available
PHPBB3-16332
2020-01-21 14:30:12 +01:00
Marc Alexander
8bdad7d73e
[ticket/16314] Reorder controller helper constructor parameters
PHPBB3-16314
2020-01-20 17:28:37 +01:00
Marc Alexander
12a624330f
Merge branch '3.2.x' into 3.3.x 2020-01-20 17:28:30 +01:00
Marc Alexander
d7be6e037b
Merge pull request #5814 from 3D-I/ticket/15079
[ticket/15079] Fix Emoji and rich text in subject of post draft
2020-01-20 17:28:24 +01:00
Marc Alexander
1d90ddc0a9
Merge branch '3.2.x' into 3.3.x 2020-01-20 17:25:56 +01:00
Marc Alexander
830d16943b
Merge pull request #5813 from 3D-I/ticket/15712
[ticket/15712] Fix Emoji and rich text in PM subject & draft
2020-01-20 17:25:48 +01:00
KYPREO
0b03fa963a [ticket/16329] Add configuration options for Plupload
PHPBB3-16329
PHPBB3-16330
2020-01-20 22:16:38 +11:00
KYPREO
a1617548cf [ticket/16329] Add configuration options for Plupload
PHPBB3-16329
PHPBB3-16330
2020-01-20 15:19:56 +11:00
Marc Alexander
2bfea20007
[ticket/16314] Create correct adm relative path for controller helper
PHPBB3-16314
2020-01-19 21:43:07 +01:00
Marc Alexander
843e3ae849
[ticket/16314] Improve handling of page_footer output for controllers
Moved the common template output to controller helper and added
garbage_collection handling to kernel_terminate_subscriber.

PHPBB3-16314
2020-01-19 16:03:32 +01:00
Marc Alexander
6f36a478a5
Merge branch '3.2.x' into 3.3.x 2020-01-18 21:46:12 +01:00
Marc Alexander
880deabac1
Merge pull request #5821 from marc1706/ticket/16296
[ticket/16296] Adjust form token check for mark actions
2020-01-18 21:46:07 +01:00
Marc Alexander
eba65f57ab
Merge branch '3.2.x' into 3.3.x 2020-01-18 16:46:52 +01:00
Marc Alexander
7f4badc947
Merge pull request #5830 from marc1706/ticket/16328
[ticket/16328] Inform admins about PHP requirements in phpBB 3.3
2020-01-18 16:46:48 +01:00
Marc Alexander
ebd9d0fe25
Merge pull request #5828 from AlfredoRamos/ticket/16323
[ticket/16323] Replace the spaceless tag with its homologue filter
2020-01-18 14:34:32 +01:00
Marc Alexander
bb5cf54e61
[ticket/16328] Inform admins about PHP requirements in phpBB 3.3
PHPBB3-16328
2020-01-18 14:03:27 +01:00
Alfredo Ramos
ff5fe30407 [ticket/16323] Replace the spaceless tag with its homologue filter
PHPBB3-16323
2020-01-14 14:44:34 -06:00
Marc Alexander
50ca72e53c
Merge branch '3.2.x' into 3.3.x 2020-01-13 17:45:06 +01:00
Marc Alexander
21f0a2b1b8
Merge pull request #5819 from mrgoldy/ticket/16291
[ticket/16291] Add missing report time
2020-01-13 17:45:00 +01:00
Marc Alexander
d25b55b93a
Merge pull request #5826 from 3D-I/ticket/16308
[ticket/16308] Fix UCP reset password
2020-01-11 16:49:04 +01:00
3D-I
e599bb2a7b [ticket/16308] Fix UCP reset password
PHPBB3-16308
2020-01-11 11:29:45 +01:00
3D-I
f26e20e1e9 [ticket/16308] Fix UCP reset password
remove HTML from PHP and code beautify

PHPBB3-16308
2020-01-10 23:23:15 +01:00
Alfredo Ramos
5d5f34518d [ticket/16313] Remove http block from sample Nginx configuration file
Change placeholder domain to example.com

Also prefer fastcgi.conf over fastcgi_params as per Nginx documentation.

PHPBB3-16313
2020-01-09 19:10:25 -06:00
3D-I
a2fa918da2 [ticket/16308] Fix UCP reset password
PHPBB3-16308
2020-01-09 23:55:47 +01:00
Marc Alexander
531f5dd9da
Merge pull request #5823 from JoshyPHP/ticket/16309
[ticket/16309] Fix smilies with a left square bracket
2020-01-09 20:37:05 +01:00
Marc Alexander
1b7c42bf53
Merge pull request #5812 from rxu/ticket/16288
[ticket/16288] PHP 8 compatibility
2020-01-09 20:34:53 +01:00
Marc Alexander
eecd0b91c5
Merge pull request #5824 from rxu/ticket/16311
[ticket/16311] Fix password length ACP setting explanation
2020-01-09 20:32:49 +01:00
rxu
9854db9120
[ticket/16311] Fix password length ACP setting explanation
PHPBB3-16311
2020-01-09 22:29:59 +07:00
JoshyPHP
aeac3df4a1 [ticket/16309] Fix smilies with a left square bracket
PHPBB3-16309
2020-01-08 19:38:50 +01:00
rxu
75c03dd81e
[ticket/16307] Fix SQL time reporting when debug.sql_explain parameter is set
PHPBB3-16307
2020-01-08 22:05:55 +07:00
rxu
f69d9e9559
[ticket/16288] Drop redundant parentheses
PHPBB3-16288
2020-01-08 17:36:48 +07:00