1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-05 16:33:34 +02:00

33795 Commits

Author SHA1 Message Date
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
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
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
a6cd4df423
Merge pull request #5808 from marc1706/ticket/16284
[ticket/16284] Move 4.0 migrations to v400 folder
2020-01-14 21:20:09 +01:00
Marc Alexander
6acdfab319
[ticket/16284] Add depends_on to classes
PHPBB3-16284
2020-01-14 17:43:17 +01:00
Marc Alexander
20cd3ccee5
Merge branch '3.3.x' 2020-01-13 17:45:12 +01: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
c2505ade2a
Merge branch '3.3.x' 2020-01-11 16:49:12 +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
3D-I
a2fa918da2 [ticket/16308] Fix UCP reset password
PHPBB3-16308
2020-01-09 23:55:47 +01:00
Marc Alexander
085b055577
Merge branch '3.3.x' 2020-01-09 20:37:10 +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
d50d878e7b
Merge branch '3.3.x' 2020-01-09 20:34:59 +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
996e263cc2
Merge branch '3.3.x' 2020-01-09 20:32:57 +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
f69d9e9559
[ticket/16288] Drop redundant parentheses
PHPBB3-16288
2020-01-08 17:36:48 +07:00
Marc Alexander
11d7b71959
[ticket/16296] Adjust form token check for mark actions
PHPBB3-16296
2020-01-07 20:26:56 +01:00
Marc Alexander
2a5c7b1d43
Merge pull request #5731 from marc1706/ticket/16204
[ticket/16204] Remove hooks system
2020-01-06 22:03:23 +01:00
Marc Alexander
417ec86d8a
Merge branch '3.3.x' 2020-01-06 12:01:26 +01:00
Marc Alexander
126b17898d
Merge branch 'prep-release-3.3.0' into 3.3.x 2020-01-06 11:59:03 +01:00
Marc Alexander
8d00784dfe
[prep-release-3.3.0] Update changelog release-3.3.0 2020-01-06 11:21:43 +01:00
Marc Alexander
17d4dcc30b
Merge pull request #5820 from marc1706/ticket/16293
[ticket/16293] Do not update to hashes that don't support combined hashing
2020-01-06 11:20:39 +01:00
Marc Alexander
16dbbdb34c
[ticket/16293] Do not update to hashes that don't support combined hashing
PHPBB3-16293
2020-01-06 11:18:16 +01:00
Marc Alexander
433a23feb4
[prep-release-3.3.0] Rename 3.3 to Proteus 2020-01-05 16:12:15 +01:00
mrgoldy
c747d1d225 [ticket/16291] Add missing report time
PHPBB3-16291
2020-01-05 16:01:37 +01:00
Marc Alexander
d4293866b3
Merge pull request #5818 from marc1706/ticket/16266
[ticket/16266] Remove extra declaration of constants
2020-01-05 15:29:40 +01:00
Marc Alexander
9fa058a8bd
[ticket/16266] Remove extra declaration of constants
PHPBB3-16266
2020-01-05 14:58:17 +01:00
Marc Alexander
4591cf9afa
[prep-release-3.3.0] Update changelog 2020-01-04 22:49:40 +01:00
Marc Alexander
ed34079452
Merge pull request #5817 from marc1706/ticket/16290
[ticket/16290] Update to new SVG logo in package docs
2020-01-04 22:48:05 +01:00
Marc Alexander
f6b47e2ee3
[ticket/16290] Update to new SVG logo in package docs
PHPBB3-16290
2020-01-04 22:32:59 +01:00
Marc Alexander
e900104e10
[prep-release-3.3.0] Add changelog for 3.3.0 2020-01-04 22:01:09 +01:00