1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 17:40:43 +01:00

33832 Commits

Author SHA1 Message Date
Marc Alexander
2d5289ed7e
Merge branch '3.3.x' 2020-02-01 08:50:24 +01:00
Marc Alexander
3bb2edd53d
Merge branch '3.2.x' into 3.3.x 2020-02-01 08:50:19 +01:00
Marc Alexander
7de24bad2e
Merge pull request #5832 from KYPREO/ticket/16329
[ticket/16329] Add configuration options for Plupload
2020-02-01 08:50:12 +01:00
Marc Alexander
c221858fab
Merge branch '3.3.x' 2020-01-30 21:38:35 +01:00
Marc Alexander
297ac8ef4c
Merge pull request #5843 from JoshyPHP/ticket/16342
[ticket/16342] Increase default hashing costs for Argon2 passwords
2020-01-30 21:38:29 +01:00
Marc Alexander
0922605da8
Merge branch '3.3.x' 2020-01-30 21:16:53 +01:00
Marc Alexander
cd995ff45f
Merge branch '3.2.x' into 3.3.x 2020-01-30 21:16:46 +01:00
Marc Alexander
e61761e9af
Merge pull request #5834 from mrgoldy/ticket/15370
[ticket/15370] Loading indicator when submitting permissions
2020-01-30 21:16:37 +01:00
KYPREO
c927c31391 [ticket/16329] Add configuration options for Plupload
PHPBB3-16329
PHPBB3-16330
2020-01-28 23:57:31 +11:00
JoshyPHP
2dbcad7840 [ticket/16342] Increase default hashing costs for Argon2 passwords
PHPBB3-16342
2020-01-28 01:42:39 +01:00
Marc Alexander
0bbe959fbd
Merge branch '3.3.x' 2020-01-27 19:49:01 +01:00
Marc Alexander
d2a344af5d
Merge pull request #5825 from AlfredoRamos/ticket/16313
[ticket/16313] Remove http block from sample Nginx configuration file
2020-01-27 19:45:15 +01:00
Marc Alexander
28ecd3a8c0
Merge branch '3.3.x' 2020-01-25 15:35:38 +01:00
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
Marc Alexander
6df36cb0c9
Merge branch '3.3.x' 2020-01-24 16:45:59 +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
e31c05f065
Merge branch '3.3.x' 2020-01-22 21:22:45 +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
6b8ccbc379
Merge branch '3.3.x' 2020-01-22 21:21:13 +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
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
912b4ae309
Merge branch '3.3.x' 2020-01-20 17:28:36 +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
0d4bf2df9d
Merge branch '3.3.x' 2020-01-20 17:26:03 +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
1fefef3e06
Merge branch '3.3.x' 2020-01-18 21:46:17 +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
6129bb08ac
Merge branch '3.3.x' 2020-01-18 16:46:58 +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
765f2cfb5f
Merge branch '3.3.x' 2020-01-18 14:34:37 +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